kmx git

Commit	Date	Message
a7ea4095	2013-06-23T01:25:34	Do not redefine WC_ERR_INVALID_CHARS WC_ERR_INVALID_CHARS might be already defined by the Windows SDK. Signed-off-by: Sven Strickroth <email@cs-ware.de>
6a15e8d2	2013-06-21T12:26:36	Loosen ensure_not_bare rules in checkout With the new target directory option to checkout, the non-bareness of the repository should be checked much later in the parameter validation process - actually that check was already in place, but I was doing it redundantly in the checkout APIs. This removes the now unnecessary early check for bare repos. It also adds some other parameter validation and makes it so that implied parameters can actually be passed as NULL (i.e. if you pass a git_index, you don't have to pass the git_repository - we can get it from index).
9094ae5a	2013-06-21T11:51:16	Add target directory to checkout This adds the ability for checkout to write to a target directory instead of having to use the working directory of the repository. This makes it easier to do exports of repository data and the like. This is similar to, but not quite the same as, the --prefix option to `git checkout-index` (this will always be treated as a directory name, not just as a simple text prefix). As part of this, the workdir iterator was extended to take the path to the working directory as a parameter and fallback on the git_repository_workdir result only if it's not specified. Fixes #1332
36fd9e30	2013-06-21T11:20:54	Fix checkout of modified file when missing from wd This fixes the checkout case when a file is modified between the baseline and the target and yet missing in the working directory. The logic for that case appears to have been wrong. This also adds a useful checkout notify callback to the checkout test helpers that will count notifications and also has a debug mode to visualize what checkout thinks that it's doing.
22b6b82f	2013-06-20T12:16:06	Add status flags to force output sort order Files in status will, be default, be sorted according to the case insensitivity of the filesystem that we're running on. However, in some cases, this is not desirable. Even on case insensitive file systems, 'git status' at the command line will generally use a case sensitive sort (like 'ls'). Some GUIs prefer to display a list of file case insensitively even on case-sensitive platforms. This adds two new flags: GIT_STATUS_OPT_SORT_CASE_SENSITIVELY and GIT_STATUS_OPT_SORT_CASE_INSENSITIVELY that will override the default sort order of the status output and give the user control. This includes tests for exercising these new options and makes the examples/status.c program emulate core Git and always use a case sensitive sort.
852ded96	2013-06-20T11:37:58	Fix bug in diff untracked dir scan When scanning untracked directories looking for non-ignored files there was a bug where an empty directory would generate a false error.
7863523a	2013-06-19T15:54:19	Add tests and fix use of freed memory This adds some tests for updating the index and having it remove items to make sure that the iteration over the index still works even as earlier items are removed. In testing with valgrind, this found a path that would use the path string from the index entry after it had been freed. The bug fix is simply to copy the path of the index entry before doing any actual index manipulation.
f30fff45	2013-06-19T15:27:25	Add index pathspec-based operations This adds three new public APIs for manipulating the index: 1. `git_index_add_all` is similar to `git add -A` and will add files in the working directory that match a pathspec to the index while honoring ignores, etc. 2. `git_index_remove_all` removes files from the index that match a pathspec. 3. `git_index_update_all` updates entries in the index based on the current contents of the working directory, either added the new information or removing the entry from the index.
85b8b18b	2013-06-19T15:22:48	Add fn to check pathspec for ignored files Command line Git sometimes generates an error message if given a pathspec that contains an exact match to an ignored file (provided --force isn't also given). This adds an internal function that makes it easy to check it that has happened. Right now, I'm not creating a public API for this because that would get a little more complicated with a need for callbacks for all invalid paths.
e91f9a8f	2013-06-19T15:20:59	Add higher level pathspec API Right now, setting up a pathspec to be parsed and processed requires several data structures and a couple of API calls. This adds a new high level data structure that contains all the items that you'll need and high-level APIs that do all of the setup and all of the teardown. This will make it easier to use pathspecs in various places with less repeated code.
e4acc3ba	2013-06-18T16:14:35	Fix rename looped reference issues This makes the diff rename tracking code more careful about the order in which it processes renames and more thorough in updating the mapping of correct renames when an earlier rename update alters the index of a later matched pair.
74ded024	2013-06-17T17:03:34	Add "as_path" parameters to blob and buffer diffs This adds parameters to the four functions that allow for blob-to- blob and blob-to-buffer differencing (either via callbacks or by making a git_diff_patch object). These parameters let you say that filename we should pretend the blob has while doing the diff. If you pass NULL, there should be no change from the existing behavior, which is to skip using attributes for file type checks and just look at content. With the parameters, you can plug into the new diff driver functionality and get binary or non-binary behavior, plus function context regular expressions, etc. This commit also fixes things so that the git_diff_delta that is generated by these functions will actually be populated with the data that we know about the blobs (or buffers) so you can use it appropriately. It also fixes a bug in generating patches from the git_diff_patch objects created via these functions. Lastly, there is one other behavior change that may matter. If there is no difference between the two blobs, these functions no longer generate any diff callbacks / patches unless you have passed in GIT_DIFF_INCLUDE_UNMODIFIED. This is pretty natural, but could potentially change the behavior of existing usage.
a1683f28	2013-06-14T16:18:04	More tests and bug fixes for status with rename This changes the behavior of the status RENAMED flags so that they will be combined with the MODIFIED flags if appropriate. If a file is modified in the index and also renamed, then the status code will have both the GIT_STATUS_INDEX_MODIFIED and INDEX_RENAMED bits set. If it is renamed but the OID has not changed, then just the GIT_STATUS_INDEX_RENAMED bit will be set. Similarly, the flags GIT_STATUS_WT_MODIFIED and GIT_STATUS_WT_RENAMED can both be set independently of one another. This fixes a serious bug where the check for unmodified files that was done at data load time could end up erasing the RENAMED state of a file that was renamed with no changes. Lastly, this contains a bunch of new tests for status with renames, including tests where the only rename changes are case changes. The expected results of these tests have to vary by whether the platform uses a case sensitive filesystem or not, so the expected data covers those platform differences separately.
eefef642	2013-06-13T16:09:53	Always do tree to index diffs case sensitively Trees are always case sensitive. The index is always case preserving and will be case sensitive when it is turned into a tree. Therefore the tree and the index can and should always be compared to one another case sensitively. This will restore the index to case insensitive order after the diff has been generated. Consider this a short-term fix. The long term fix is to have the index always stored both case sensitively and case insensitively (at least on platforms that sometimes require case insensitivity).
6ea999bb	2013-06-13T15:52:12	Make index_insert keep existing case In a case insensitive index, if you attempt to add a file from disk with a different case pattern, the old case pattern in the index should be preserved. This fixes that (and a couple of minor warnings).
351888cf	2013-06-13T15:37:06	Improve case handling in git_diff__paired_foreach This commit reinstates some changes to git_diff__paired_foreach that were discarded during the rebase (because the diff_output.c file had gone away), and also adjusts the case insensitively logic slightly to hopefully deal with either mismatched icase diffs and other case insensitivity scenarios.
a3e8dbb4	2013-06-13T15:32:09	Be more careful about the path with diffs This makes diff more careful about picking the canonical path when generating a delta so that it won't accidentally pick up a case-mismatched path on a case-insensitive file system. This should make sure we use the "most accurate" case correct version of the path (i.e. from the tree if possible, or the index if need be).
3a68d7f0	2013-06-13T15:30:26	Fix broken status EXCLUDE_SUBMODULES logic The exclude submodules flag was not doing the right thing, in that a file with no diff between the head and the index and just a delete in the workdir could be excluded if submodules were excluded.
c9b18018	2013-06-13T15:26:56	Fix some warnings
e3b4a47c	2013-05-31T16:30:09	git__strcasesort_cmp: strcasecmp sorting rules but requires strict equality
dfe8c8df	2013-05-22T23:19:40	handle renames in status computation
1ee2ef87	2013-05-21T11:05:21	status access by index, providing more details to callers
09c2f91c	2013-06-17T18:48:02	branch: More obvious semantics in `foreach`
2ad7a4dc	2013-06-17T18:25:30	ref: free the last ref when cancelling git_branch_foreach() Also fixed an assert typo on nulltoken's HEAD
0525fb7e	2013-06-17T14:31:14	cred: deploy git__memzero to clear memory holding a password
3425fee6	2013-06-17T14:27:34	util: git__memzero() tweaks On Linux: fix a warning message related to the volatile qualifier (cast) On Windows: use SecureZeroMemory() On both, inline the call, so that no entry point can lead back to this "secure" memory zeroing.
2da72fb2	2013-06-14T12:10:13	fileops: fix invalid read
c1cf1af4	2013-06-12T21:15:58	cmake: Add option to specify the name of the binary
37f66e82	2013-06-12T15:21:21	Fix Windows warnings This fixes problems with missing function prototypes and 64-bit data issues on Windows.
88c401be	2013-06-12T14:54:32	Merge pull request #1643 from ethomson/rename_source Keep data about source of similarity
93da7af7	2013-06-12T14:52:47	Merge pull request #1642 from arrbee/diff-function-context Diff code reorg plus function context in diff headers
360f42f4	2013-06-12T14:18:09	Fix diff header naming issues This makes the git_diff_patch definition private to diff_patch.c and fixes a number of other header file naming inconsistencies to use `git_` prefixes on functions and structures that are shared between files.
ef3374a8	2013-06-12T13:46:44	Improvements to git_array This changes the size data to uint32_t, fixes the array growth logic to use a simple 1.5x multiplier, and uses a generic inline function for growing the array to make the git_array_alloc API feel more natural (i.e. it returns a pointer to the new item).
5a6e45cc	2013-06-12T21:14:04	Revert "cmake: Update Windows resources to reflect the optional vendor string" This reverts commit 095bfd748766966f5515bdfe64867d6a09287123.
6de9b2ee	2013-06-12T21:10:33	util: It's called `memzero`
eb58e2d0	2013-06-12T21:05:48	Merge remote-tracking branch 'arrbee/minor-paranoia' into development
f9c824c5	2013-06-12T11:55:27	Add patch from blobs API This adds two new public APIs: git_diff_patch_from_blobs and git_diff_patch_from_blob_and_buffer, plus it refactors the code for git_diff_blobs and git_diff_blob_to_buffer so that they code is almost entirely shared between these APIs, and adds tests for the new APIs.
54faddd2	2013-06-12T11:54:11	Fix some diff driver memory leaks
42e6cf78	2013-06-11T17:45:14	Add diff drivers tests (and fix bugs) This adds real tests for user-configured diff drivers and in the process found a bunch of bugs.
5dc98298	2013-06-11T11:22:22	Implement regex pattern diff driver This implements the loading of regular expression pattern lists for diff drivers that search for function context in that way. This also changes the way that diff drivers update options and interface with xdiff APIs to make them a little more flexible.
24ec6999	2013-06-11T10:48:00	signature: extend trimming to more whitespace There are all sorts of misconfiguration in the wild. We already rely on the signature constructor to trim SP. Extend the logic to use `isspace` to decide whether a character should be trimmed.
3eadfecd	2013-06-10T15:24:20	start implementing diff driver registry
2f77d8f1	2013-06-10T14:16:56	Fix some memory leaks
596b121a	2013-06-10T14:16:49	fix missing file and bad prototype
690bf41c	2013-06-10T15:16:44	keep source similarity in rename detection
114f5a6c	2013-06-10T10:10:39	Reorganize diff and add basic diff driver This is a significant reorganization of the diff code to break it into a set of more clearly distinct files and to document the new organization. Hopefully this will make the diff code easier to understand and to extend. This adds a new `git_diff_driver` object that looks of diff driver information from the attributes and the config so that things like function content in diff headers can be provided. The full driver spec is not implemented in the commit - this is focused on the reorganization of the code and putting the driver hooks in place. This also removes a few #includes from src/repository.h that were overbroad, but as a result required extra #includes in a variety of places since including src/repository.h no longer results in pulling in the whole world.
3e9e6cda	2013-06-07T09:54:33	Add safe memset and use it This adds a `git__memset` routine that will not be optimized away and updates the places where I memset() right before a free() call to use it.
f7e56150	2013-06-05T15:41:42	Make mkdir early exit cases clearer There are two places where git_futils_mkdir should exit early or at least do less. The first is when using GIT_MKDIR_SKIP_LAST and having that flag leave no directory left to create; it was being handled previously, but the behavior was subtle. Now I put in a clear explicit check that exits early in that case. The second is when there is no directory to create, but there is a valid path that should be verified. I shifted the logic a bit so we'll be better about not entering the loop than that happens.
7000f3fa	2013-06-04T10:32:59	Move some diff helpers into separate file
aad6967b	2013-05-29T21:52:21	Basic function context header This implements a basic callback to extract function context for a diff. It always uses the same search heuristic right now with no regular expressions or language-specific variants. Those will come next, I think.
999d4405	2013-06-05T12:02:28	Simplify git_futils_mkdir This routine was (is) pretty complicated, but given the recent changes, it seemed like it could be simplified a bit.
2e1fa15f	2013-06-05T19:00:16	I'm a dick
b832ecf7	2013-06-05T09:46:51	Ensure git_futils_mkdir won't mkdir root This makes sure that git_futils_mkdir always skips over the root directory at a minimum, even on platforms where the root is not simply '/'. Also, this removes the GIT_WIN32 ifdef in favor of making EACCES as a potentially recoverable error on all platforms.
e236b37f	2013-06-05T09:16:19	Merge pull request #1633 from jamill/directory_create_fix Allow creation of directories under the volume root in Win32
daf98cb2	2013-06-04T14:49:39	Allow creation of directories under the volume root in Win32 We ran into an issue where cloning a repository to a folder directly underneath the root of a volume (e.g. 'd:\libgit2') would fail with an access denied error. This was traced down to a call to make a directory that is the root (e.g. 'd:') could return an error indicated access denied instead of an error indicating the path already exists. This change now handles the access denied error on Win32 and checks for the existence of the folder.
947fad4f	2013-06-03T09:28:58	Merge pull request #1624 from libgit2/vmg/full-ref-iterator Breaking RefDB changes
dc33b3d7	2013-06-02T02:13:45	Don't bail on parsing commits with an invalid timezone git doesn't do that, and it's not something that's usually actionable to fix. if you have a git repository with one bad timezone in the history, it's too late to change it most likely.
03a89070	2013-05-31T21:49:40	Make git_index_read_tree preserve stat cache Instead of just blowing away the stat cache data when loading a new tree into the index, this checks if each loaded item has a corresponding existing item with the same OID and if so, copies the stat data from the old item to the new one so it will not be blown away.
1a42dd17	2013-05-31T14:13:11	Mutex init can fail It is obviously quite a serious problem if this happens, but mutex initialization can fail and we should detect it. It's a bit like a memory allocation failure, in that you're probably pretty screwed if this occurs, but at least we'll catch it.
f658dc43	2013-05-31T14:09:58	Zero memory for major objects before freeing By zeroing out the memory when we free larger objects (i.e. those that serve as collections of other data, such as repos, odb, refdb), I'm hoping that it will be easier for libgit2 bindings to find errors in their object management code.
cee695ae	2013-05-31T12:18:43	Make iterators use GIT_ITEROVER & smart advance 1. internal iterators now return GIT_ITEROVER when you go past the last item in the iteration. 2. git_iterator_advance will "advance" to the first item in the iteration if it is called immediately after creating the iterator, which allows a simpler idiom for basic iteration. 3. if git_iterator_advance encounters an error reading data (e.g. a missing tree or an unreadable file), it returns the error but also attempts to advance past the invalid data to prevent an infinite loop. Updated all tests and internal usage of iterators to account for these new behaviors.
17ef7dbc	2013-05-31T09:51:53	Merge pull request #1626 from ethomson/index_ext_truncation improve test for index extension truncation
8c2458be	2013-05-31T11:41:33	improve test for index extension truncation
8d863aa2	2013-05-31T06:01:59	Merge pull request #1621 from NHDaly/clone_transport_flags Added support for setting transport flags (No check SSL cert) to git_clo...
88392914	2013-05-30T01:12:27	Added support for setting transport flags (No check SSL cert) to git_clone call.
9afc5971	2013-05-31T03:09:38	Merge pull request #1559 from carlosmn/ref-shorthand Introduce git_reference_shorthand
af2c72d2	2013-05-31T03:08:48	Merge pull request #1623 from yorah/fix/tag_auto remote: make default tag retrieving behaviour consistent
1ed356dc	2013-05-30T21:04:28	Frees
df50512a	2013-05-30T18:06:54	Proposal to handle default value (auto = 0)
215af2cc	2013-05-30T17:40:56	remote: make default tag retrieving behaviour consistent Default for newly created remotes will be auto. Default when loading existing remotes with no tag retrieving behaviour set, was already auto.
b2984e8a	2013-05-30T08:43:14	Merge pull request #1622 from yorah/fix/thread-segfault thread: fix segfault on Windows 64 bits
979f75d8	2013-05-30T17:19:43	Refcounting
d17db2fd	2013-05-30T11:30:34	thread: fix segfault on Windows 64 bits `lpExitCode` is a pointer to a long. A long is 32 bits wide on Windows. It means that on Windows 64bits, `GetExitCodeThread()` doesn't set/clear the high-order bytes of the 64 bits memory space pointed at by `value_ptr`.
4e6e2ff2	2013-05-30T03:47:10	...Aaaand this works
2d160ef7	2013-05-29T16:03:30	allow (ignore) bare slash in gitignore
ec24e542	2013-05-29T22:47:37	What are the chances, really
56960b83	2013-05-28T20:47:55	Liike this
2638a03a	2013-05-28T17:50:47	This refs iterator pleases the gods.
9007c53f	2013-05-27T16:45:22	Fixing unwrapped calloc
563c19a9	2013-05-11T11:36:29	packbuilder: also write index in git_packbuilder_write git_packbuilder_write() used to write a packfile to the passed file path. Instead, ask for a destination directory and create both the packfile and an index, as most users probably do expect.
c37fb41a	2013-05-25T12:35:55	qsort_r appeared in glibc 2.8
7a5ee3dc	2013-05-24T11:09:04	Add ~ expansion to global attributes and excludes This adds ~/ prefix expansion for the value of core.attributesfile and core.excludesfile, plus it fixes the fact that the attributes cache was holding on to the string data from the config for a long time (instead of making its own strdup) which could have caused a problem if the config was refreshed. Adds a test for the new expansion capability.
d20b0449	2013-05-24T10:37:40	Clarify GIT_DIFF_INCLUDE_UNTRACKED_CONTENT option This improves the docs for GIT_DIFF_INCLUDE_UNTRACKED_CONTENT as well as the other flags related to UNTRACKED items in diff, plus it makes that flag now automatically turn on GIT_DIFF_INCLUDE_UNTRACKED which seems like a reasonable dwim type of change.
16adc9fa	2013-05-24T10:35:58	Typedef git_config_level_t and use it everywhere The GIT_CONFIG_LEVEL constants actually work well as an enum because they are mutually exclusive, so this adds a typedef to the enum and uses that everywhere that one of these constants are expected, instead of the old code that typically used an unsigned int.
2e62e7c2	2013-05-24T10:33:41	Docs for git_libgit2_opts and cache disable tweak This adds docs for the cache control options to git_libgit2_opts and also tweaks the cache code so that if the cache is disabled, then the next time we attempt to insert something into the cache in question, we will actually clear any old cached objects.
43efc449	2013-05-16T11:03:55	Ensure reuc vector is always valid In theory, if there was a problem reading the REUC data, the read_reuc() routine could have left uninitialized and invalid data in the git_index vector. This moves the line that inserts a new entry into the vector down to the bottom of the routine so we know all the content is already valid. Also, per @linquize, this uses calloc to ensure no uninitialized data.
25a899ec	2013-05-24T10:30:32	qsort_r is broken on HURD, avoid
26ab6284	2013-05-24T03:30:35	Merge pull request #1593 from ethomson/conflict_iterator introduce git_conflict_iterator
f7ceef06	2013-05-24T03:24:27	Merge pull request #1592 from ethomson/merge_setup merge setup
4811c150	2013-05-24T01:14:52	Merge pull request #1603 from ben/shallow Shallow-clone detection
30caf0cf	2013-05-24T01:13:48	Merge pull request #1595 from arrbee/even-more-rename-fixes Even more rename detection fixes
6f0b8142	2013-05-23T17:28:52	Stop leaking memory
0700ca1a	2013-05-23T16:11:53	More config code checks and cleanups
3b32b6d3	2013-05-23T09:19:42	More tests of config with various absent files Plus a bit of extra paranoia to ensure config object has valid contents.
49f70f2c	2013-05-23T15:48:06	Fill out diff rename test coverage This extends the rename tests to make sure that every rename scenario in the inner loop of git_diff_find_similar is actually exercised. Also, fixes an incorrect assert that was in one of the clauses that was not previously being exercised.
93d8f77f	2013-05-23T15:11:53	Improve test failure output
f38cea97	2013-05-23T15:21:43	Move core.abbrev lookup out of diff print loop This moves the GIT_CVAR_ABBREV lookup out of the loop. Also, this fixes git_diff_print_raw to actually use that constant instead of hardcoding 7 characters.
67db583d	2013-05-23T15:06:07	More diff rename tests; better split swap handling This adds a couple more tests of different rename scenarios. Also, this fixes a problem with the case where you have two "split" deltas and the left half of one matches the right half of the other. That case was already being handled, but in the wrong order in a way that could result in bad output. Also, if the swap also happened to put the other two halves into the correct place (i.e. two files exchanged places with each other), then the second delta was left with the SPLIT flag set when it really should be cleared.
c68b09dc	2013-05-23T11:52:34	Fix dereference of freed delta I was accidentally using a value that I had just freed. This moves the clearing of the delta internal flags into a better place.
9c941ccf	2013-05-23T08:52:24	Merge pull request #1599 from nulltoken/topic/windows_resources Update windows resources to match the dll name

a7ea4095

2013-06-23T01:25:34

Do not redefine WC_ERR_INVALID_CHARS WC_ERR_INVALID_CHARS might be already defined by the Windows SDK. Signed-off-by: Sven Strickroth <email@cs-ware.de>

6a15e8d2

2013-06-21T12:26:36

Loosen ensure_not_bare rules in checkout With the new target directory option to checkout, the non-bareness of the repository should be checked much later in the parameter validation process - actually that check was already in place, but I was doing it redundantly in the checkout APIs. This removes the now unnecessary early check for bare repos. It also adds some other parameter validation and makes it so that implied parameters can actually be passed as NULL (i.e. if you pass a git_index, you don't have to pass the git_repository - we can get it from index).

9094ae5a

2013-06-21T11:51:16

Add target directory to checkout This adds the ability for checkout to write to a target directory instead of having to use the working directory of the repository. This makes it easier to do exports of repository data and the like. This is similar to, but not quite the same as, the --prefix option to `git checkout-index` (this will always be treated as a directory name, not just as a simple text prefix). As part of this, the workdir iterator was extended to take the path to the working directory as a parameter and fallback on the git_repository_workdir result only if it's not specified. Fixes #1332

36fd9e30

2013-06-21T11:20:54

Fix checkout of modified file when missing from wd This fixes the checkout case when a file is modified between the baseline and the target and yet missing in the working directory. The logic for that case appears to have been wrong. This also adds a useful checkout notify callback to the checkout test helpers that will count notifications and also has a debug mode to visualize what checkout thinks that it's doing.

22b6b82f

2013-06-20T12:16:06

Add status flags to force output sort order Files in status will, be default, be sorted according to the case insensitivity of the filesystem that we're running on. However, in some cases, this is not desirable. Even on case insensitive file systems, 'git status' at the command line will generally use a case sensitive sort (like 'ls'). Some GUIs prefer to display a list of file case insensitively even on case-sensitive platforms. This adds two new flags: GIT_STATUS_OPT_SORT_CASE_SENSITIVELY and GIT_STATUS_OPT_SORT_CASE_INSENSITIVELY that will override the default sort order of the status output and give the user control. This includes tests for exercising these new options and makes the examples/status.c program emulate core Git and always use a case sensitive sort.

852ded96

2013-06-20T11:37:58

Fix bug in diff untracked dir scan When scanning untracked directories looking for non-ignored files there was a bug where an empty directory would generate a false error.

7863523a

2013-06-19T15:54:19

Add tests and fix use of freed memory This adds some tests for updating the index and having it remove items to make sure that the iteration over the index still works even as earlier items are removed. In testing with valgrind, this found a path that would use the path string from the index entry after it had been freed. The bug fix is simply to copy the path of the index entry before doing any actual index manipulation.

f30fff45

2013-06-19T15:27:25

Add index pathspec-based operations This adds three new public APIs for manipulating the index: 1. `git_index_add_all` is similar to `git add -A` and will add files in the working directory that match a pathspec to the index while honoring ignores, etc. 2. `git_index_remove_all` removes files from the index that match a pathspec. 3. `git_index_update_all` updates entries in the index based on the current contents of the working directory, either added the new information or removing the entry from the index.

85b8b18b

2013-06-19T15:22:48

Add fn to check pathspec for ignored files Command line Git sometimes generates an error message if given a pathspec that contains an exact match to an ignored file (provided --force isn't also given). This adds an internal function that makes it easy to check it that has happened. Right now, I'm not creating a public API for this because that would get a little more complicated with a need for callbacks for all invalid paths.

e91f9a8f

2013-06-19T15:20:59

Add higher level pathspec API Right now, setting up a pathspec to be parsed and processed requires several data structures and a couple of API calls. This adds a new high level data structure that contains all the items that you'll need and high-level APIs that do all of the setup and all of the teardown. This will make it easier to use pathspecs in various places with less repeated code.

e4acc3ba

2013-06-18T16:14:35

Fix rename looped reference issues This makes the diff rename tracking code more careful about the order in which it processes renames and more thorough in updating the mapping of correct renames when an earlier rename update alters the index of a later matched pair.

74ded024

2013-06-17T17:03:34

Add "as_path" parameters to blob and buffer diffs This adds parameters to the four functions that allow for blob-to- blob and blob-to-buffer differencing (either via callbacks or by making a git_diff_patch object). These parameters let you say that filename we should pretend the blob has while doing the diff. If you pass NULL, there should be no change from the existing behavior, which is to skip using attributes for file type checks and just look at content. With the parameters, you can plug into the new diff driver functionality and get binary or non-binary behavior, plus function context regular expressions, etc. This commit also fixes things so that the git_diff_delta that is generated by these functions will actually be populated with the data that we know about the blobs (or buffers) so you can use it appropriately. It also fixes a bug in generating patches from the git_diff_patch objects created via these functions. Lastly, there is one other behavior change that may matter. If there is no difference between the two blobs, these functions no longer generate any diff callbacks / patches unless you have passed in GIT_DIFF_INCLUDE_UNMODIFIED. This is pretty natural, but could potentially change the behavior of existing usage.

a1683f28

2013-06-14T16:18:04

More tests and bug fixes for status with rename This changes the behavior of the status RENAMED flags so that they will be combined with the MODIFIED flags if appropriate. If a file is modified in the index and also renamed, then the status code will have both the GIT_STATUS_INDEX_MODIFIED and INDEX_RENAMED bits set. If it is renamed but the OID has not changed, then just the GIT_STATUS_INDEX_RENAMED bit will be set. Similarly, the flags GIT_STATUS_WT_MODIFIED and GIT_STATUS_WT_RENAMED can both be set independently of one another. This fixes a serious bug where the check for unmodified files that was done at data load time could end up erasing the RENAMED state of a file that was renamed with no changes. Lastly, this contains a bunch of new tests for status with renames, including tests where the only rename changes are case changes. The expected results of these tests have to vary by whether the platform uses a case sensitive filesystem or not, so the expected data covers those platform differences separately.

eefef642

2013-06-13T16:09:53

Always do tree to index diffs case sensitively Trees are always case sensitive. The index is always case preserving and will be case sensitive when it is turned into a tree. Therefore the tree and the index can and should always be compared to one another case sensitively. This will restore the index to case insensitive order after the diff has been generated. Consider this a short-term fix. The long term fix is to have the index always stored both case sensitively and case insensitively (at least on platforms that sometimes require case insensitivity).

6ea999bb

2013-06-13T15:52:12

Make index_insert keep existing case In a case insensitive index, if you attempt to add a file from disk with a different case pattern, the old case pattern in the index should be preserved. This fixes that (and a couple of minor warnings).

351888cf

2013-06-13T15:37:06

Improve case handling in git_diff__paired_foreach This commit reinstates some changes to git_diff__paired_foreach that were discarded during the rebase (because the diff_output.c file had gone away), and also adjusts the case insensitively logic slightly to hopefully deal with either mismatched icase diffs and other case insensitivity scenarios.

a3e8dbb4

2013-06-13T15:32:09

Be more careful about the path with diffs This makes diff more careful about picking the canonical path when generating a delta so that it won't accidentally pick up a case-mismatched path on a case-insensitive file system. This should make sure we use the "most accurate" case correct version of the path (i.e. from the tree if possible, or the index if need be).

3a68d7f0

2013-06-13T15:30:26

Fix broken status EXCLUDE_SUBMODULES logic The exclude submodules flag was not doing the right thing, in that a file with no diff between the head and the index and just a delete in the workdir could be excluded if submodules were excluded.

c9b18018

2013-06-13T15:26:56

Fix some warnings

e3b4a47c

2013-05-31T16:30:09

git__strcasesort_cmp: strcasecmp sorting rules but requires strict equality

dfe8c8df

2013-05-22T23:19:40

handle renames in status computation

1ee2ef87

2013-05-21T11:05:21

status access by index, providing more details to callers

09c2f91c

2013-06-17T18:48:02

branch: More obvious semantics in `foreach`

2ad7a4dc

2013-06-17T18:25:30

ref: free the last ref when cancelling git_branch_foreach() Also fixed an assert typo on nulltoken's HEAD

0525fb7e

2013-06-17T14:31:14

cred: deploy git__memzero to clear memory holding a password

3425fee6

2013-06-17T14:27:34

util: git__memzero() tweaks On Linux: fix a warning message related to the volatile qualifier (cast) On Windows: use SecureZeroMemory() On both, inline the call, so that no entry point can lead back to this "secure" memory zeroing.

2da72fb2

2013-06-14T12:10:13

fileops: fix invalid read

c1cf1af4

2013-06-12T21:15:58

cmake: Add option to specify the name of the binary

37f66e82

2013-06-12T15:21:21

Fix Windows warnings This fixes problems with missing function prototypes and 64-bit data issues on Windows.

88c401be

2013-06-12T14:54:32

Merge pull request #1643 from ethomson/rename_source Keep data about source of similarity

93da7af7

2013-06-12T14:52:47

Merge pull request #1642 from arrbee/diff-function-context Diff code reorg plus function context in diff headers

360f42f4

2013-06-12T14:18:09

Fix diff header naming issues This makes the git_diff_patch definition private to diff_patch.c and fixes a number of other header file naming inconsistencies to use `git_` prefixes on functions and structures that are shared between files.

ef3374a8

2013-06-12T13:46:44

Improvements to git_array This changes the size data to uint32_t, fixes the array growth logic to use a simple 1.5x multiplier, and uses a generic inline function for growing the array to make the git_array_alloc API feel more natural (i.e. it returns a pointer to the new item).

5a6e45cc

2013-06-12T21:14:04

Revert "cmake: Update Windows resources to reflect the optional vendor string" This reverts commit 095bfd748766966f5515bdfe64867d6a09287123.

6de9b2ee

2013-06-12T21:10:33

util: It's called `memzero`

eb58e2d0

2013-06-12T21:05:48

Merge remote-tracking branch 'arrbee/minor-paranoia' into development

f9c824c5

2013-06-12T11:55:27

Add patch from blobs API This adds two new public APIs: git_diff_patch_from_blobs and git_diff_patch_from_blob_and_buffer, plus it refactors the code for git_diff_blobs and git_diff_blob_to_buffer so that they code is almost entirely shared between these APIs, and adds tests for the new APIs.

54faddd2

2013-06-12T11:54:11

Fix some diff driver memory leaks

42e6cf78

2013-06-11T17:45:14

Add diff drivers tests (and fix bugs) This adds real tests for user-configured diff drivers and in the process found a bunch of bugs.

5dc98298

2013-06-11T11:22:22

Implement regex pattern diff driver This implements the loading of regular expression pattern lists for diff drivers that search for function context in that way. This also changes the way that diff drivers update options and interface with xdiff APIs to make them a little more flexible.

24ec6999

2013-06-11T10:48:00

signature: extend trimming to more whitespace There are all sorts of misconfiguration in the wild. We already rely on the signature constructor to trim SP. Extend the logic to use `isspace` to decide whether a character should be trimmed.

3eadfecd

2013-06-10T15:24:20

start implementing diff driver registry

2f77d8f1

2013-06-10T14:16:56

Fix some memory leaks

596b121a

2013-06-10T14:16:49

fix missing file and bad prototype

690bf41c

2013-06-10T15:16:44

keep source similarity in rename detection

114f5a6c

2013-06-10T10:10:39

Reorganize diff and add basic diff driver This is a significant reorganization of the diff code to break it into a set of more clearly distinct files and to document the new organization. Hopefully this will make the diff code easier to understand and to extend. This adds a new `git_diff_driver` object that looks of diff driver information from the attributes and the config so that things like function content in diff headers can be provided. The full driver spec is not implemented in the commit - this is focused on the reorganization of the code and putting the driver hooks in place. This also removes a few #includes from src/repository.h that were overbroad, but as a result required extra #includes in a variety of places since including src/repository.h no longer results in pulling in the whole world.

3e9e6cda

2013-06-07T09:54:33

Add safe memset and use it This adds a `git__memset` routine that will not be optimized away and updates the places where I memset() right before a free() call to use it.

f7e56150

2013-06-05T15:41:42

Make mkdir early exit cases clearer There are two places where git_futils_mkdir should exit early or at least do less. The first is when using GIT_MKDIR_SKIP_LAST and having that flag leave no directory left to create; it was being handled previously, but the behavior was subtle. Now I put in a clear explicit check that exits early in that case. The second is when there is no directory to create, but there is a valid path that should be verified. I shifted the logic a bit so we'll be better about not entering the loop than that happens.

7000f3fa

2013-06-04T10:32:59

Move some diff helpers into separate file

aad6967b

2013-05-29T21:52:21

Basic function context header This implements a basic callback to extract function context for a diff. It always uses the same search heuristic right now with no regular expressions or language-specific variants. Those will come next, I think.

999d4405

2013-06-05T12:02:28

Simplify git_futils_mkdir This routine was (is) pretty complicated, but given the recent changes, it seemed like it could be simplified a bit.

2e1fa15f

2013-06-05T19:00:16

I'm a dick

b832ecf7

2013-06-05T09:46:51

Ensure git_futils_mkdir won't mkdir root This makes sure that git_futils_mkdir always skips over the root directory at a minimum, even on platforms where the root is not simply '/'. Also, this removes the GIT_WIN32 ifdef in favor of making EACCES as a potentially recoverable error on all platforms.

e236b37f

2013-06-05T09:16:19

Merge pull request #1633 from jamill/directory_create_fix Allow creation of directories under the volume root in Win32

daf98cb2

2013-06-04T14:49:39

Allow creation of directories under the volume root in Win32 We ran into an issue where cloning a repository to a folder directly underneath the root of a volume (e.g. 'd:\libgit2') would fail with an access denied error. This was traced down to a call to make a directory that is the root (e.g. 'd:') could return an error indicated access denied instead of an error indicating the path already exists. This change now handles the access denied error on Win32 and checks for the existence of the folder.

947fad4f

2013-06-03T09:28:58

Merge pull request #1624 from libgit2/vmg/full-ref-iterator Breaking RefDB changes

dc33b3d7

2013-06-02T02:13:45

Don't bail on parsing commits with an invalid timezone git doesn't do that, and it's not something that's usually actionable to fix. if you have a git repository with one bad timezone in the history, it's too late to change it most likely.

03a89070

2013-05-31T21:49:40

Make git_index_read_tree preserve stat cache Instead of just blowing away the stat cache data when loading a new tree into the index, this checks if each loaded item has a corresponding existing item with the same OID and if so, copies the stat data from the old item to the new one so it will not be blown away.

1a42dd17

2013-05-31T14:13:11

Mutex init can fail It is obviously quite a serious problem if this happens, but mutex initialization can fail and we should detect it. It's a bit like a memory allocation failure, in that you're probably pretty screwed if this occurs, but at least we'll catch it.

f658dc43

2013-05-31T14:09:58

Zero memory for major objects before freeing By zeroing out the memory when we free larger objects (i.e. those that serve as collections of other data, such as repos, odb, refdb), I'm hoping that it will be easier for libgit2 bindings to find errors in their object management code.

cee695ae

2013-05-31T12:18:43

Make iterators use GIT_ITEROVER & smart advance 1. internal iterators now return GIT_ITEROVER when you go past the last item in the iteration. 2. git_iterator_advance will "advance" to the first item in the iteration if it is called immediately after creating the iterator, which allows a simpler idiom for basic iteration. 3. if git_iterator_advance encounters an error reading data (e.g. a missing tree or an unreadable file), it returns the error but also attempts to advance past the invalid data to prevent an infinite loop. Updated all tests and internal usage of iterators to account for these new behaviors.

17ef7dbc

2013-05-31T09:51:53

Merge pull request #1626 from ethomson/index_ext_truncation improve test for index extension truncation

8c2458be

2013-05-31T11:41:33

improve test for index extension truncation

8d863aa2

2013-05-31T06:01:59

Merge pull request #1621 from NHDaly/clone_transport_flags Added support for setting transport flags (No check SSL cert) to git_clo...

88392914

2013-05-30T01:12:27

Added support for setting transport flags (No check SSL cert) to git_clone call.

9afc5971

2013-05-31T03:09:38

Merge pull request #1559 from carlosmn/ref-shorthand Introduce git_reference_shorthand

af2c72d2

2013-05-31T03:08:48

Merge pull request #1623 from yorah/fix/tag_auto remote: make default tag retrieving behaviour consistent

1ed356dc

2013-05-30T21:04:28

Frees

df50512a

2013-05-30T18:06:54

Proposal to handle default value (auto = 0)

215af2cc

2013-05-30T17:40:56

remote: make default tag retrieving behaviour consistent Default for newly created remotes will be auto. Default when loading existing remotes with no tag retrieving behaviour set, was already auto.

b2984e8a

2013-05-30T08:43:14

Merge pull request #1622 from yorah/fix/thread-segfault thread: fix segfault on Windows 64 bits

979f75d8

2013-05-30T17:19:43

Refcounting

d17db2fd

2013-05-30T11:30:34

thread: fix segfault on Windows 64 bits `lpExitCode` is a pointer to a long. A long is 32 bits wide on Windows. It means that on Windows 64bits, `GetExitCodeThread()` doesn't set/clear the high-order bytes of the 64 bits memory space pointed at by `value_ptr`.

4e6e2ff2

2013-05-30T03:47:10

...Aaaand this works

2d160ef7

2013-05-29T16:03:30

allow (ignore) bare slash in gitignore

ec24e542

2013-05-29T22:47:37

What are the chances, really

56960b83

2013-05-28T20:47:55

Liike this

2638a03a

2013-05-28T17:50:47

This refs iterator pleases the gods.

9007c53f

2013-05-27T16:45:22

Fixing unwrapped calloc

563c19a9

2013-05-11T11:36:29

packbuilder: also write index in git_packbuilder_write git_packbuilder_write() used to write a packfile to the passed file path. Instead, ask for a destination directory and create both the packfile and an index, as most users probably do expect.

c37fb41a

2013-05-25T12:35:55

qsort_r appeared in glibc 2.8

7a5ee3dc

2013-05-24T11:09:04

Add ~ expansion to global attributes and excludes This adds ~/ prefix expansion for the value of core.attributesfile and core.excludesfile, plus it fixes the fact that the attributes cache was holding on to the string data from the config for a long time (instead of making its own strdup) which could have caused a problem if the config was refreshed. Adds a test for the new expansion capability.

d20b0449

2013-05-24T10:37:40

Clarify GIT_DIFF_INCLUDE_UNTRACKED_CONTENT option This improves the docs for GIT_DIFF_INCLUDE_UNTRACKED_CONTENT as well as the other flags related to UNTRACKED items in diff, plus it makes that flag now automatically turn on GIT_DIFF_INCLUDE_UNTRACKED which seems like a reasonable dwim type of change.

16adc9fa

2013-05-24T10:35:58

Typedef git_config_level_t and use it everywhere The GIT_CONFIG_LEVEL constants actually work well as an enum because they are mutually exclusive, so this adds a typedef to the enum and uses that everywhere that one of these constants are expected, instead of the old code that typically used an unsigned int.

2e62e7c2

2013-05-24T10:33:41

Docs for git_libgit2_opts and cache disable tweak This adds docs for the cache control options to git_libgit2_opts and also tweaks the cache code so that if the cache is disabled, then the next time we attempt to insert something into the cache in question, we will actually clear any old cached objects.

43efc449

2013-05-16T11:03:55

Ensure reuc vector is always valid In theory, if there was a problem reading the REUC data, the read_reuc() routine could have left uninitialized and invalid data in the git_index vector. This moves the line that inserts a new entry into the vector down to the bottom of the routine so we know all the content is already valid. Also, per @linquize, this uses calloc to ensure no uninitialized data.

25a899ec

2013-05-24T10:30:32

qsort_r is broken on HURD, avoid

26ab6284

2013-05-24T03:30:35

Merge pull request #1593 from ethomson/conflict_iterator introduce git_conflict_iterator

f7ceef06

2013-05-24T03:24:27

Merge pull request #1592 from ethomson/merge_setup merge setup

4811c150

2013-05-24T01:14:52

Merge pull request #1603 from ben/shallow Shallow-clone detection

30caf0cf

2013-05-24T01:13:48

Merge pull request #1595 from arrbee/even-more-rename-fixes Even more rename detection fixes

6f0b8142

2013-05-23T17:28:52

Stop leaking memory

0700ca1a

2013-05-23T16:11:53

More config code checks and cleanups

3b32b6d3

2013-05-23T09:19:42

More tests of config with various absent files Plus a bit of extra paranoia to ensure config object has valid contents.

49f70f2c

2013-05-23T15:48:06

Fill out diff rename test coverage This extends the rename tests to make sure that every rename scenario in the inner loop of git_diff_find_similar is actually exercised. Also, fixes an incorrect assert that was in one of the clauses that was not previously being exercised.

93d8f77f

2013-05-23T15:11:53

Improve test failure output

f38cea97

2013-05-23T15:21:43

Move core.abbrev lookup out of diff print loop This moves the GIT_CVAR_ABBREV lookup out of the loop. Also, this fixes git_diff_print_raw to actually use that constant instead of hardcoding 7 characters.

67db583d

2013-05-23T15:06:07

More diff rename tests; better split swap handling This adds a couple more tests of different rename scenarios. Also, this fixes a problem with the case where you have two "split" deltas and the left half of one matches the right half of the other. That case was already being handled, but in the wrong order in a way that could result in bad output. Also, if the swap also happened to put the other two halves into the correct place (i.e. two files exchanged places with each other), then the second delta was left with the SPLIT flag set when it really should be cleared.

c68b09dc

2013-05-23T11:52:34

Fix dereference of freed delta I was accidentally using a value that I had just freed. This moves the clearing of the delta internal flags into a better place.

9c941ccf

2013-05-23T08:52:24

Merge pull request #1599 from nulltoken/topic/windows_resources Update windows resources to match the dll name

thodg/libgit2/src

src

Log