Commit Graph

3395 Commits

Author SHA1 Message Date
Justin Spahr-Summers
f358ec143c Don't expect the 'empty-remote-url' remote to be listed
CC @nulltoken
2012-11-05 10:45:26 -08:00
Justin Spahr-Summers
1fe99aeea3 Test for GITERR_INVALID 2012-11-05 10:44:48 -08:00
Justin Spahr-Summers
f8baece754 Set GITERR_INVALID when encountering a NULL remote URL 2012-11-05 10:42:10 -08:00
nulltoken
a2a618948c remote: Add malformed remote load test 2012-11-04 23:08:17 -08:00
Justin Spahr-Summers
83885891f5 Bail out if remote->url would be NULL
This fixes a crash from attempting to invoke git__strdup() against NULL.
2012-11-04 22:01:24 -08:00
Philip Kelley
1e99ce9ac7 Merge pull request #1042 from pwkelley/progress_cb
Fix bytes_received in fetch tests - we weren't calling the callback
2012-11-02 11:42:45 -07:00
Philip Kelley
438906e160 Fix bytes_received in fetch tests - we weren't calling the callback 2012-11-02 14:34:06 -04:00
Russell Belfer
3ae0aad75a Move error capture to top of giterr_set 2012-11-02 10:42:20 -07:00
Vicent Martí
1362a98316 Merge pull request #1014 from arrbee/diff-rename-detection
Initial implementation of diff rename detection
2012-11-02 10:00:28 -07:00
Philip Kelley
473a7a1e70 Merge pull request #1040 from ethomson/index_refactor
Free conflict index entries on removal
2012-11-02 08:43:17 -07:00
Philip Kelley
2c087f81e1 Merge pull request #1041 from pwkelley/transports
Prefer GetLastError() for GITERR_OS on Win32
2012-11-02 08:40:09 -07:00
Philip Kelley
8f624a4726 Prefer GetLastError() for GITERR_OS on Win32 2012-11-02 11:30:55 -04:00
Edward Thomson
050cf8b8a6 freeing index entries would be helpful 2012-11-02 01:01:21 -05:00
Vicent Marti
e30c052c4e LEAAAVE ME ALOOOONEEE 2012-11-01 23:01:42 +01:00
Vicent Martí
d13da328e2 Merge pull request #1038 from arrbee/doc-fixes
Improve docs, examples, warnings
2012-11-01 14:18:40 -07:00
Russell Belfer
60ad7d52b8 Merge pull request #1037 from libgit2/index-open-cleanup
Some more changes to the Index API
2012-11-01 14:16:19 -07:00
Russell Belfer
b90500f03d Improve docs, examples, warnings
This improves docs in some of the public header files, cleans
up and improves some of the example code, and fixes a couple
of pedantic warnings in places.
2012-11-01 14:08:30 -07:00
Vicent Marti
1e808f9cda index: Add git_index_new 2012-11-01 20:28:28 +01:00
Vicent Marti
43eeca04a7 index: Fix tests 2012-11-01 20:24:43 +01:00
Vicent Marti
276ea401b3 index: Add git_index_write_tree 2012-11-01 20:17:10 +01:00
Vicent Marti
8ff0f3250a index: Switch to git_futils_filestamp 2012-11-01 20:17:09 +01:00
Russell Belfer
dbd6850d06 Hide deprecations on MacOS
Why Apple, why?
2012-11-01 10:57:14 -07:00
Russell Belfer
da0bfb6728 Merge pull request #1036 from jamill/text_stat
Update of text stats calculation
2012-11-01 10:14:04 -07:00
Jameson Miller
c902f5a0ff Update of text stats calculation
Do not interpret 0x85 as Next Line (NEL)
char when gathering statistics for a text file.
2012-11-01 12:26:56 -04:00
Vicent Martí
7ae73e94db Merge pull request #1030 from pwkelley/transports
Reorganize transport architecture
2012-11-01 09:15:29 -07:00
Philip Kelley
ff830366ea Http: Set an error for invalid content-type 2012-11-01 12:07:42 -04:00
Philip Kelley
e068f2bb71 Fix a bug in cl_setenv on Windows XP 2012-11-01 11:50:08 -04:00
Philip Kelley
0ccfc63bd6 Improve consistency of WinHTTP request headers 2012-11-01 10:29:30 -04:00
Philip Kelley
41fb1ca0ec Reorganize transport architecture (squashed 3) 2012-11-01 09:02:33 -04:00
Vicent Marti
003808b38c Merge branch 'config-refresh' into development 2012-10-31 20:52:16 +01:00
Vicent Marti
c1f61af66b I LIKE THESE NAMES 2012-10-31 20:52:01 +01:00
Russell Belfer
c8b511f3cd Better naming for file timestamp/size checker 2012-10-31 11:26:12 -07:00
Ben Straub
a9db123b09 Checkout: remove duplicate 100% progress report 2012-10-31 10:14:13 -07:00
Ben Straub
c48e87006c Ensure that non-error is not propagated 2012-10-31 10:13:57 -07:00
Russell Belfer
744cc03e2b Add git_config_refresh() API to reload config
This adds a new API that allows users to reload the config if the
file has changed on disk.  A new config callback function to
refresh the config was added.

The modified time and file size are used to test if the file needs
to be reloaded (and are now stored in the disk backend object).

In writing tests, just using mtime was a problem / race, so I
wanted to check file size as well.  To support that, I extended
`git_futils_readbuffer_updated` to optionally check file size in
addition to mtime, and I added a new function `git_filebuf_stats`
to fetch the mtime and size for an open filebuf (so that the
config could be easily refreshed after a write).

Lastly, I moved some similar file checking code for attributes
into filebuf.  It is still only being used for attrs, but it
seems potentially reusable, so I thought I'd move it over.
2012-10-30 12:11:23 -07:00
Vicent Martí
efde422553 Merge pull request #1017 from arrbee/diff-patch-to-str
Add git_diff_patch_to_str API
2012-10-30 12:04:28 -07:00
Vicent Martí
c4a9ded0f9 Merge pull request #1026 from nulltoken/repo/state
repo: enhance git_repository_state() detection
2012-10-30 12:03:22 -07:00
Vicent Martí
6c21358a89 Merge pull request #1029 from ethomson/index_refactor
Index changes
2012-10-30 11:51:58 -07:00
Michael Schubert
6cfbbf7e32 Fix a couple of warnings 2012-10-30 18:50:59 +01:00
Russell Belfer
db106d01f0 Move rename detection into new file
This improves the naming for the rename related functionality
moving it to be called `git_diff_find_similar()` and renaming
all the associated constants, etc. to make more sense.

I also moved the new code (plus the existing `git_diff_merge`)
into a new file `diff_tform.c` where I can put new functions
related to manipulating git diff lists.

This also updates the implementation significantly from the
last revision fixing some ordering issues (where break-rewrite
needs to be handled prior to copy and rename detection) and
improving config option handling.
2012-10-30 09:40:50 -07:00
Edward Thomson
f45ec1a076 index refactoring 2012-10-29 20:04:21 -05:00
Ben Straub
81eecc342b Fetch: don't clobber received count
This memset was being reached after the entire packfile under
WinHttp, so the byte count was being lost for small repos.
2012-10-29 13:34:14 -07:00
Vicent Martí
63e44d5e9b Merge pull request #1027 from PaulThompson/cmake-flags-clean
Cmake flags clean
2012-10-29 13:24:08 -07:00
Vicent Martí
8a1479a55a Merge pull request #796 from nulltoken/topic/git-stash
Stash
2012-10-29 12:57:04 -07:00
Paul Thompson
88149fae9f Leave CMAKE_BUILD_TYPE absent on those generators which don't use it. 2012-10-28 10:21:28 +11:00
Paul Thompson
4a3be934de Removed overwrite of CMAKE_C_FLAGS_DEBUG.
- No overwriting allows control from cmake cache or cmdline
- -g is already the CMake default
- -O0 is already gcc's default
2012-10-28 09:56:18 +11:00
Paul Thompson
54c56d3efd Remove "-O2 -g" from default CMAKE_C_FLAGS.
- Those are the RelWithDebInfo flags.
- They should be controlled from CMAKE_BUILD_TYPE
2012-10-28 09:42:54 +11:00
Paul Thompson
2df7c94490 Remove duplicate CMAKE_C_FLAGS inside CMAKE_C_FLAGS_DEBUG.
- For Debug builds, CMake uses concatenated
  CMAKE_C_FLAGS and CMAKE_C_FLAGS_DEBUG
- This reverts commit 291f712292.
2012-10-28 09:30:08 +11:00
nulltoken
31966d20e3 repo: enhance git_repository_state() detection 2012-10-27 16:45:59 +02:00
nulltoken
00e161b977 tests: fix a memory leak 2012-10-27 11:43:48 +02:00