kmx git

Commit	Date	Message
92808557	2013-06-20T15:10:42	Fix comment and copyright in example
f18f772a	2013-06-20T14:27:14	Add example implementation of long format status
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.
cf300bb9	2013-06-20T11:39:31	Initial implementation of status example
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.
8b2fa181	2013-06-19T16:18:30	Merge pull request #1661 from arrbee/index-add-all Index operations using globs
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.
5144850c	2013-06-19T06:42:22	Merge pull request #1660 from trast/tr/fix-zlib-configuration CMakeLists: fix zlib linker setup
c41281ad	2013-06-19T13:36:59	CMakeLists: fix zlib linker setup b53671a (Search for zlib unconditional, 2012-12-18) changed things around to always (even on windows, that's what the subject refers to) call FIND_PACKAGE(ZLIB). However, it did not correctly handle the case where ZLIB_LIBRARY is cached, either by the user setting it manually or by an earlier search. In that case, the IF(ZLIB_FOUND) would not trigger (that variable is not cached) and we'd instead use the built-in version. 000e689 (CMake: don't try to use bundled zlib when the system's path is in the cache, 2013-05-12) tried to fix that, but it actually made the problem worse: now with ZLIB_LIBRARY cached, _neither_ of the blocks would execute, resulting in a linker error for me when trying to build such a doubly-configured setup. To fix the issue, we just trust CMake to do the right thing. If ZLIB_LIBRARY is set (either from user or cache) then the find_library in FindZLIB.cmake will use that instead of searching again. So we can unconditionally (for real this time) call FIND_PACKAGE(ZLIB), and just check its result.
84ba4944	2013-06-18T16:42:35	Merge pull request #1659 from arrbee/rename-cycle-fixes Diff rename detection cycle fixes
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.
f0f2ff9c	2013-06-17T17:33:40	test failure when renames produce similar similarities
3b334075	2013-06-17T17:39:59	test illustrating tri-cyclic rename failure
ffb762fe	2013-06-18T04:30:25	Merge pull request #1657 from arrbee/diff-blob-as-path Add "as_path" parameters to blob and buffer diff APIs
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.
c09810ee	2013-06-17T10:46:15	Merge pull request #1651 from arrbee/status_indexed_updates Status indexed updates
f4183347	2013-06-17T10:23:53	Update clar to latest version
de0555a3	2013-06-17T09:55:29	Fix memory leaks in diff rename tests This fixes a couple objects I forgot to free, and also updates the valgrind suppressions file on the Mac to cover a few more cases that had crept in.
f3b5bc83	2013-06-16T21:51:43	Add test of rename with no changes A tree to index rename with no changes was getting erased by the iteration routine (if the routine actually loaded the data for the unmodified file). This invokes the code path that was previously messing up the diff and iterates twice to make sure that the iteration process itself doesn't modify the data.
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.
fb03a223	2013-06-13T16:31:11	Test has to work on case sensitive systems
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).
1540b199	2013-05-31T18:12:49	some simple case-sensitive index tests
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
4e28e638	2013-06-13T15:27:30	Clarify some docs and minor reordering This simplifies some documentation and hopefully makes a couple of things easier to read. Also, this rearrages the order in this branch so that the overall diff against the trunk will hopefully be a bit cleaner.
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`
bd2319c8	2013-06-17T09:38:04	Merge pull request #1655 from yorah/fix/ref-memleak ref: free the last ref when cancelling git_branch_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
70587136	2013-06-17T08:53:22	Merge pull request #1654 from yorah/memzero Memzero stuffs
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.
824cf80f	2013-06-14T11:13:05	Merge pull request #1652 from yorah/fix/build-warnings Fix/build warnings
519072c9	2013-06-14T14:02:00	diff: fix warning
2da72fb2	2013-06-14T12:10:13	fileops: fix invalid read
4878ea45	2013-06-13T02:47:45	Merge pull request #1650 from nulltoken/ntk/winrc-filename cmake: Add option to specify the name of the binary
c1cf1af4	2013-06-12T21:15:58	cmake: Add option to specify the name of the binary
3b5001b4	2013-06-12T15:39:22	Merge pull request #1647 from arrbee/fix-win32-warnings-part-112 Fix Windows warnings and missing prototypes
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.
5438e9c2	2013-06-11T15:34:53	Merge pull request #1645 from csware/config_level_app Add high(est) config level for application specific config files
76b893b6	2013-06-11T21:33:18	Add high(est) config level for application specific config files Some tools use an extra level to maintain an application specific config files on top of the normal ones. Revision 16adc9fade52b49e2bc13cb52407cc0025a93c8b broke this. Signed-off-by: Sven Strickroth <email@cs-ware.de>
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.
9d4db41a	2013-06-11T06:30:18	Merge pull request #1644 from carlosmn/sig-isspace signature: extend trimming to more whitespace
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
bda3fbb1	2013-06-10T14:17:54	failing unit test for similar renames
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.
3de768ca	2013-06-06T17:07:29	Merge pull request #1635 from arrbee/simplify-mkdir Simplify git_futils_mkdir
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
987ab765	2013-06-05T09:57:59	Merge pull request #1634 from arrbee/alternative-mkdir-fix Ensure git_futils_mkdir won't mkdir root
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
9d9fff3c	2013-06-02T02:16:05	Merge pull request #1631 from scottjg/fix-timezone-parsing Don't bail on parsing commits with an invalid timezone
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.
cfbd08a5	2013-06-01T04:28:24	Merge pull request #1630 from arrbee/index-read-tree-preserve-stat-cache Make git_index_read_tree preserve stat cache where possible
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.
efd5a4e1	2013-05-31T14:36:08	Merge pull request #1627 from arrbee/iterator-api-improvements Make iterators use GIT_ITEROVER & smart advance
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
9d6d809b	2013-05-31T03:06:07	Merge pull request #1530 from veeti/http-parser Build with the system's http-parser installation if available
1ed356dc	2013-05-30T21:04:28	Frees
7a6e0281	2013-05-02T14:07:22	Build with the system's http-parser installation if available
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.

92808557

2013-06-20T15:10:42

Fix comment and copyright in example

f18f772a

2013-06-20T14:27:14

Add example implementation of long format status

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.

cf300bb9

2013-06-20T11:39:31

Initial implementation of status example

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.

8b2fa181

2013-06-19T16:18:30

Merge pull request #1661 from arrbee/index-add-all Index operations using globs

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.

5144850c

2013-06-19T06:42:22

Merge pull request #1660 from trast/tr/fix-zlib-configuration CMakeLists: fix zlib linker setup

c41281ad

2013-06-19T13:36:59

CMakeLists: fix zlib linker setup b53671a (Search for zlib unconditional, 2012-12-18) changed things around to always (even on windows, that's what the subject refers to) call FIND_PACKAGE(ZLIB). However, it did not correctly handle the case where ZLIB_LIBRARY is cached, either by the user setting it manually or by an earlier search. In that case, the IF(ZLIB_FOUND) would not trigger (that variable is not cached) and we'd instead use the built-in version. 000e689 (CMake: don't try to use bundled zlib when the system's path is in the cache, 2013-05-12) tried to fix that, but it actually made the problem worse: now with ZLIB_LIBRARY cached, _neither_ of the blocks would execute, resulting in a linker error for me when trying to build such a doubly-configured setup. To fix the issue, we just trust CMake to do the right thing. If ZLIB_LIBRARY is set (either from user or cache) then the find_library in FindZLIB.cmake will use that instead of searching again. So we can unconditionally (for real this time) call FIND_PACKAGE(ZLIB), and just check its result.

84ba4944

2013-06-18T16:42:35

Merge pull request #1659 from arrbee/rename-cycle-fixes Diff rename detection cycle fixes

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.

f0f2ff9c

2013-06-17T17:33:40

test failure when renames produce similar similarities

3b334075

2013-06-17T17:39:59

test illustrating tri-cyclic rename failure

ffb762fe

2013-06-18T04:30:25

Merge pull request #1657 from arrbee/diff-blob-as-path Add "as_path" parameters to blob and buffer diff APIs

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.

c09810ee

2013-06-17T10:46:15

Merge pull request #1651 from arrbee/status_indexed_updates Status indexed updates

f4183347

2013-06-17T10:23:53

Update clar to latest version

de0555a3

2013-06-17T09:55:29

Fix memory leaks in diff rename tests This fixes a couple objects I forgot to free, and also updates the valgrind suppressions file on the Mac to cover a few more cases that had crept in.

f3b5bc83

2013-06-16T21:51:43

Add test of rename with no changes A tree to index rename with no changes was getting erased by the iteration routine (if the routine actually loaded the data for the unmodified file). This invokes the code path that was previously messing up the diff and iterates twice to make sure that the iteration process itself doesn't modify the data.

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.

fb03a223

2013-06-13T16:31:11

Test has to work on case sensitive systems

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).

1540b199

2013-05-31T18:12:49

some simple case-sensitive index tests

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

4e28e638

2013-06-13T15:27:30

Clarify some docs and minor reordering This simplifies some documentation and hopefully makes a couple of things easier to read. Also, this rearrages the order in this branch so that the overall diff against the trunk will hopefully be a bit cleaner.

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`

bd2319c8

2013-06-17T09:38:04

Merge pull request #1655 from yorah/fix/ref-memleak ref: free the last ref when cancelling git_branch_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

70587136

2013-06-17T08:53:22

Merge pull request #1654 from yorah/memzero Memzero stuffs

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.

824cf80f

2013-06-14T11:13:05

Merge pull request #1652 from yorah/fix/build-warnings Fix/build warnings

519072c9

2013-06-14T14:02:00

diff: fix warning

2da72fb2

2013-06-14T12:10:13

fileops: fix invalid read

4878ea45

2013-06-13T02:47:45

Merge pull request #1650 from nulltoken/ntk/winrc-filename cmake: Add option to specify the name of the binary

c1cf1af4

2013-06-12T21:15:58

cmake: Add option to specify the name of the binary

3b5001b4

2013-06-12T15:39:22

Merge pull request #1647 from arrbee/fix-win32-warnings-part-112 Fix Windows warnings and missing prototypes

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.

5438e9c2

2013-06-11T15:34:53

Merge pull request #1645 from csware/config_level_app Add high(est) config level for application specific config files

76b893b6

2013-06-11T21:33:18

Add high(est) config level for application specific config files Some tools use an extra level to maintain an application specific config files on top of the normal ones. Revision 16adc9fade52b49e2bc13cb52407cc0025a93c8b broke this. Signed-off-by: Sven Strickroth <email@cs-ware.de>

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.

9d4db41a

2013-06-11T06:30:18

Merge pull request #1644 from carlosmn/sig-isspace signature: extend trimming to more whitespace

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

bda3fbb1

2013-06-10T14:17:54

failing unit test for similar renames

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.

3de768ca

2013-06-06T17:07:29

Merge pull request #1635 from arrbee/simplify-mkdir Simplify git_futils_mkdir

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

987ab765

2013-06-05T09:57:59

Merge pull request #1634 from arrbee/alternative-mkdir-fix Ensure git_futils_mkdir won't mkdir root

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

9d9fff3c

2013-06-02T02:16:05

Merge pull request #1631 from scottjg/fix-timezone-parsing Don't bail on parsing commits with an invalid timezone

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.

cfbd08a5

2013-06-01T04:28:24

Merge pull request #1630 from arrbee/index-read-tree-preserve-stat-cache Make git_index_read_tree preserve stat cache where possible

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.

efd5a4e1

2013-05-31T14:36:08

Merge pull request #1627 from arrbee/iterator-api-improvements Make iterators use GIT_ITEROVER & smart advance

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

9d6d809b

2013-05-31T03:06:07

Merge pull request #1530 from veeti/http-parser Build with the system's http-parser installation if available

1ed356dc

2013-05-30T21:04:28

Frees

7a6e0281

2013-05-02T14:07:22

Build with the system's http-parser installation if available

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.

thodg/libgit2

Log