kmx git

Commit	Date	Message
2d9f5b9f	2013-08-07T11:11:55	Parse config headers with quoted quotes Parse config headers that have the last quote on the line quoted instead of walking off the end.
c5780abb	2013-08-05T21:58:48	Merge pull request #1765 from arrbee/ambiguous-oids More tests for ambiguous OIDs across packs
437224b4	2013-08-05T21:46:32	More tests for ambiguous OIDs across packs The test coverage for ambiguous OIDs was pretty thin. This adds a bunch of new objects both in packs, across packs, and loose that match to 8 characters so that we can test various cases of ambiguous lookups.
f1af935b	2013-08-05T21:53:09	submodule: check alloc and name presense
4cee9b86	2013-07-22T11:41:23	Update init and clean for revwalk::basic tests The new tests don't always want to use the same fixture data as the old ones so this makes it configurable on a per-test basis.
b7107131	2013-07-22T11:01:19	git_reference_next_name must match git_reference_next The git_reference_next API silently skips invalid references when scanning the loose refs. The git_reference_next_name API should skip the same ones even though it isn't creating the reference object. This adds a test with a an invalid loose reference and makes sure that both APIs skip the same entries and generate the same results.
97309dd0	2013-07-19T10:43:53	Merge pull request #1726 from crazymaster/development git_buf_text_gather_stats doesn't work for multi-byte characters
d0b25d9d	2013-07-15T08:14:00	Fix
2185dd6f	2013-07-15T07:59:04	Fix typo
19bee769	2013-07-15T07:39:16	Revert "Replace Japanese characters with the encoded hexadecimal values" This reverts commit a91e4d6b21e141c2abc76b65b2d4c91d5d3e03cc.
a91e4d6b	2013-07-15T07:19:42	Replace Japanese characters with the encoded hexadecimal values
d6d34cd0	2013-07-13T02:10:16	Add test for multi-byte characters
80fd31fa	2013-07-13T13:30:23	revparse: Don't return a reference when asked for a git object Fix #1722
d6cb13d7	2013-07-13T14:00:05	tests: Fix memory leak
584f2d30	2013-07-11T11:04:42	Fix warnings on Win64
125655fe	2013-07-02T16:49:57	Untracked directories with .git should be ignored This restores a behavior that was accidentally lost during some diff refactoring where an untracked directory that contains a .git item should be treated as IGNORED, not as UNTRACKED. The submodule code already detects this, but the diff code was not handling the scenario right. This also updates a number of existing tests that were actually exercising the behavior but did not have the right expectations in place. It actually makes the new `test_diff_submodules__diff_ignore_options` test feel much better because the "not-a-submodule" entries are now ignored instead of showing up as untracked items. Fixes #1697
9564229a	2013-06-30T08:43:07	Add tests for diff.ignoreSubmdules config
f9775a37	2013-06-29T23:22:31	Add ignore_submodules to diff options This adds correct support for an equivalent to --ignore-submodules in diff, where an actual ignore value can be passed to diff to override the per submodule settings in the configuration. This required tweaking the constants for ignore values so that zero would not be used and could represent an unset option to the diff. This was an opportunity to move the submodule values into include/git2/types.h and to rename the poorly named DEFAULT values for ignore and update constants to RESET instead. Now the GIT_DIFF_IGNORE_SUBMODULES flag is exactly the same as setting the ignore_submodules option to GIT_SUBMODULE_IGNORE_ALL (which is actually a minor change from the old behavior in that submodules will now be treated as UNMODIFIED deltas instead of being left out totally - if you set GIT_DIFF_INCLUDE_UNMODIFIED). This includes tests for the various new settings.
2e3e273e	2013-06-29T13:20:45	Update diff to new internal submodule status API Submodules now expose an internal status API that allows diff to get back the OID values from the submodule very easily and also to avoiding caching issues and to override the ignore setting for the submodule.
3fe046cf	2013-06-29T13:13:38	Add BARE option to git_repository_open_ext This adds a BARE option to git_repository_open_ext which allows a fast open path that still knows how to read gitlinks and to search for the actual .git directory from a subdirectory. `git_repository_open_bare` is still simpler and faster, but having a gitlink aware fast open is very useful for submodules where we want to quickly be able to peek at the HEAD and index data without doing any other meaningful repo operations.
e807860f	2013-06-27T16:52:38	Add timestamp check to submodule status This is probably not the final form of this change, but this is a preliminary version of checking a timestamp to see if the cached working directory HEAD OID matches the current. Right now, this uses the timestamp on the index and is, like most of our timestamp checking, subject to having only second accuracy.
4535f044	2013-06-27T16:12:44	More diff submodule tests for cache issues The submodules code caches data about submodules in a way that can cause problems. This adds some tests that try making various modifications to the state of a submodule to see where we can catch out problems in the submodule caching. Right now, I've put in an extra git_submodule_reload_all so that the test will pass, but with that commented out, the test fails. I'm working on fixing the broken version of the test at which point I'll commit the fix and delete the extra reload that makes the test pass.
3e7d7100	2013-06-27T16:12:00	Fix diff test helper to show parent file/line
49621a34	2013-06-27T15:46:46	Fix memory leak in test
12f8fe00	2013-06-27T15:43:12	More improvements to submodule diff tests This controls for the diff.mnemonicprefix setting so that can't break the tests. Also, this expands one test to emulate an ObjectiveGit test more closely.
0105b55e	2013-06-27T15:26:31	Add another submodule test of dirty wd
2b672d5b	2013-07-08T22:46:36	Add git_pathspec_match_diff API This adds an additional pathspec API that will match a pathspec against a diff object. This is convenient if you want to handle renames (so you need the whole diff and can't use the pathspec constraint built into the diff API) but still want to tell if the diff had any files that matched the pathspec. When the pathspec is matched against a diff, instead of keeping a list of filenames that matched, instead the API keeps the list of git_diff_deltas that matched and they can be retrieved via a new API git_pathspec_match_list_diff_entry. There are a couple of other minor API extensions here that were mostly for the sake of convenience and to reduce dependencies on knowing the internal data structure between files inside the library.
6fc5a581	2013-07-08T22:42:02	Basic bit vector This is a simple bit vector object that is not resizable after the initial allocation but can be of arbitrary size. It will keep the bti vector entirely on the stack for vectors 64 bits or less, and will allocate the vector on the heap for larger sizes. The API is uniform regardless of storage location. This is very basic right now and all the APIs are inline functions, but it is useful for storing an array of boolean values.
d2ce27dd	2013-06-24T23:16:06	Add public API for pathspec matching This adds a new public API for compiling pathspecs and matching them against the working directory, the index, or a tree from the repository. This also reworks the pathspec internals to allow the sharing of code between the existing internal usage of pathspec matching and the new external API. While this is working and the new API is ready for discussion, I think there is still an incorrect behavior in which patterns are always matched against the full path of an entry without taking the subdirectories into account (so "s*" will match "subdir/file" even though it wouldn't with core Git). Further enhancements are coming, but this was a good place to take a functional snapshot.
b8cd7aa9	2013-07-09T17:20:55	Merge pull request #1704 from arrbee/kill-status-index-then-workdir Remove GIT_STATUS_SHOW_INDEX_THEN_WORKDIR option
77fa06f3	2013-07-09T17:20:36	Merge pull request #1695 from arrbee/fix-1695 API should not be ifdeffed
7b5c0d18	2013-07-09T16:45:23	Add more tests for git_config_get_multivar The old tests didn't try failing lookups or lookups across multiple config files with some having the pattern and some not having it.
290e1479	2013-07-09T16:17:41	Add GIT_CAP_SSH if library was built with SSH This also adds a test that actually calls git_libgit2_capabilities and git_libgit2_version.
a5f9b5f8	2013-07-05T16:59:38	Diff hunk context off by one on long lines The diff hunk context string that is returned to xdiff need not be NUL terminated because the xdiff code just copies the number of bytes that you report directly into the output. There was an off by one in the diff driver code when the header context was longer than the output buffer size, the output buffer length included the NUL byte which was copied into the hunk header. Fixes #1710
2a16914c	2013-07-03T12:20:34	Remove GIT_STATUS_SHOW_INDEX_THEN_WORKDIR option This option serves no benefit now that the git_status_list API is available. It was of questionable value before and now it would just be a bad idea to use it rather than the indexed API.
9b6075b2	2013-07-03T17:07:20	Fix segfault in git_status_foreach_ext() Add tests for the `GIT_STATUS_SHOW_XXX` flags.
d90390c1	2013-06-29T13:38:27	test: Fix memory leak
c4ac556e	2013-06-29T12:48:58	Fix compilation warnings
f2c41884	2013-06-27T22:48:46	Merge pull request #1688 from arrbee/submodule-load-ignore-orphaned-head Test submodules with empty index or orphaned head
1e9dd60f	2013-06-27T22:29:05	Test submodules with empty index or orphaned head In both of these cases, the submodule data should still be loaded just (obviously) without the data that comes from either the index or the HEAD. This fixes a bug in the orphaned head case.
c67ff958	2013-06-27T07:38:27	Fix bug marking submodule diffs as unmodified There was a bug where submodules whose HEAD had not been moved were being marked as having an UNMODIFIED delta record instead of being left MODIFIED. This fixes that and fixes the tests to notice if a submodule has been incorrectly marked as UNMODIFIED.
c7974b49	2013-06-26T12:03:33	Fail on unmodified deltas when they're unexpected
b0401c68	2013-06-25T16:36:50	Merge pull request #1681 from arthurschreiber/patch-1 Prefer younger merge bases over older ones.
24ba6d3f	2013-06-25T22:55:13	Add a test case.
edbaa63a	2013-06-25T09:04:04	Unbreak git_remote_ls on a local transport after disconnecting.
c0e58e43	2013-06-25T00:12:19	test-rename: This is not a decimal, silly
f3f4c6b5	2013-06-24T11:56:35	Fix checkout tests on Windows
d4f98ba4	2013-06-21T12:29:03	Addition checkout target directory tests This adds additonal tests of the checkout target directory option including using it to dump data from bare repos.
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.
dacce80b	2013-06-20T19:05:38	test asserting checkout should not recreate deleted files
94ef2a35	2013-06-20T15:15:10	Add test for fixed diff bug Add test for bug fixed in 852ded96982ae70acb63c3940fae08ea29e40fee Sorry, I wrote that bug fix and forgot to check in a test at the same time. Here is one that fails on the old version of the code and now works.
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.
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.
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.
3b334075	2013-06-17T17:39:59	test illustrating tri-cyclic rename failure
f0f2ff9c	2013-06-17T17:33:40	test failure when renames produce similar similarities
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.
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
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.
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
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
519072c9	2013-06-14T14:02:00	diff: fix warning
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
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.
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.
947fad4f	2013-06-03T09:28:58	Merge pull request #1624 from libgit2/vmg/full-ref-iterator Breaking RefDB changes
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.
9afc5971	2013-05-31T03:09:38	Merge pull request #1559 from carlosmn/ref-shorthand Introduce git_reference_shorthand
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.
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
ca9b1702	2013-05-29T09:18:21	Fix memory leak in oid shortener tests
56960b83	2013-05-28T20:47:55	Liike this
0582ae6f	2013-05-21T13:56:40	tests: don't verify SSH unsupported with GIT_SSH
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.
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
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
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.

2d9f5b9f

2013-08-07T11:11:55

Parse config headers with quoted quotes Parse config headers that have the last quote on the line quoted instead of walking off the end.

c5780abb

2013-08-05T21:58:48

Merge pull request #1765 from arrbee/ambiguous-oids More tests for ambiguous OIDs across packs

437224b4

2013-08-05T21:46:32

More tests for ambiguous OIDs across packs The test coverage for ambiguous OIDs was pretty thin. This adds a bunch of new objects both in packs, across packs, and loose that match to 8 characters so that we can test various cases of ambiguous lookups.

f1af935b

2013-08-05T21:53:09

submodule: check alloc and name presense

4cee9b86

2013-07-22T11:41:23

Update init and clean for revwalk::basic tests The new tests don't always want to use the same fixture data as the old ones so this makes it configurable on a per-test basis.

b7107131

2013-07-22T11:01:19

git_reference_next_name must match git_reference_next The git_reference_next API silently skips invalid references when scanning the loose refs. The git_reference_next_name API should skip the same ones even though it isn't creating the reference object. This adds a test with a an invalid loose reference and makes sure that both APIs skip the same entries and generate the same results.

97309dd0

2013-07-19T10:43:53

Merge pull request #1726 from crazymaster/development git_buf_text_gather_stats doesn't work for multi-byte characters

d0b25d9d

2013-07-15T08:14:00

Fix

2185dd6f

2013-07-15T07:59:04

Fix typo

19bee769

2013-07-15T07:39:16

Revert "Replace Japanese characters with the encoded hexadecimal values" This reverts commit a91e4d6b21e141c2abc76b65b2d4c91d5d3e03cc.

a91e4d6b

2013-07-15T07:19:42

Replace Japanese characters with the encoded hexadecimal values

d6d34cd0

2013-07-13T02:10:16

Add test for multi-byte characters

80fd31fa

2013-07-13T13:30:23

revparse: Don't return a reference when asked for a git object Fix #1722

d6cb13d7

2013-07-13T14:00:05

tests: Fix memory leak

584f2d30

2013-07-11T11:04:42

Fix warnings on Win64

125655fe

2013-07-02T16:49:57

Untracked directories with .git should be ignored This restores a behavior that was accidentally lost during some diff refactoring where an untracked directory that contains a .git item should be treated as IGNORED, not as UNTRACKED. The submodule code already detects this, but the diff code was not handling the scenario right. This also updates a number of existing tests that were actually exercising the behavior but did not have the right expectations in place. It actually makes the new `test_diff_submodules__diff_ignore_options` test feel much better because the "not-a-submodule" entries are now ignored instead of showing up as untracked items. Fixes #1697

9564229a

2013-06-30T08:43:07

Add tests for diff.ignoreSubmdules config

f9775a37

2013-06-29T23:22:31

Add ignore_submodules to diff options This adds correct support for an equivalent to --ignore-submodules in diff, where an actual ignore value can be passed to diff to override the per submodule settings in the configuration. This required tweaking the constants for ignore values so that zero would not be used and could represent an unset option to the diff. This was an opportunity to move the submodule values into include/git2/types.h and to rename the poorly named DEFAULT values for ignore and update constants to RESET instead. Now the GIT_DIFF_IGNORE_SUBMODULES flag is exactly the same as setting the ignore_submodules option to GIT_SUBMODULE_IGNORE_ALL (which is actually a minor change from the old behavior in that submodules will now be treated as UNMODIFIED deltas instead of being left out totally - if you set GIT_DIFF_INCLUDE_UNMODIFIED). This includes tests for the various new settings.

2e3e273e

2013-06-29T13:20:45

Update diff to new internal submodule status API Submodules now expose an internal status API that allows diff to get back the OID values from the submodule very easily and also to avoiding caching issues and to override the ignore setting for the submodule.

3fe046cf

2013-06-29T13:13:38

Add BARE option to git_repository_open_ext This adds a BARE option to git_repository_open_ext which allows a fast open path that still knows how to read gitlinks and to search for the actual .git directory from a subdirectory. `git_repository_open_bare` is still simpler and faster, but having a gitlink aware fast open is very useful for submodules where we want to quickly be able to peek at the HEAD and index data without doing any other meaningful repo operations.

e807860f

2013-06-27T16:52:38

Add timestamp check to submodule status This is probably not the final form of this change, but this is a preliminary version of checking a timestamp to see if the cached working directory HEAD OID matches the current. Right now, this uses the timestamp on the index and is, like most of our timestamp checking, subject to having only second accuracy.

4535f044

2013-06-27T16:12:44

More diff submodule tests for cache issues The submodules code caches data about submodules in a way that can cause problems. This adds some tests that try making various modifications to the state of a submodule to see where we can catch out problems in the submodule caching. Right now, I've put in an extra git_submodule_reload_all so that the test will pass, but with that commented out, the test fails. I'm working on fixing the broken version of the test at which point I'll commit the fix and delete the extra reload that makes the test pass.

3e7d7100

2013-06-27T16:12:00

Fix diff test helper to show parent file/line

49621a34

2013-06-27T15:46:46

Fix memory leak in test

12f8fe00

2013-06-27T15:43:12

More improvements to submodule diff tests This controls for the diff.mnemonicprefix setting so that can't break the tests. Also, this expands one test to emulate an ObjectiveGit test more closely.

0105b55e

2013-06-27T15:26:31

Add another submodule test of dirty wd

2b672d5b

2013-07-08T22:46:36

Add git_pathspec_match_diff API This adds an additional pathspec API that will match a pathspec against a diff object. This is convenient if you want to handle renames (so you need the whole diff and can't use the pathspec constraint built into the diff API) but still want to tell if the diff had any files that matched the pathspec. When the pathspec is matched against a diff, instead of keeping a list of filenames that matched, instead the API keeps the list of git_diff_deltas that matched and they can be retrieved via a new API git_pathspec_match_list_diff_entry. There are a couple of other minor API extensions here that were mostly for the sake of convenience and to reduce dependencies on knowing the internal data structure between files inside the library.

6fc5a581

2013-07-08T22:42:02

Basic bit vector This is a simple bit vector object that is not resizable after the initial allocation but can be of arbitrary size. It will keep the bti vector entirely on the stack for vectors 64 bits or less, and will allocate the vector on the heap for larger sizes. The API is uniform regardless of storage location. This is very basic right now and all the APIs are inline functions, but it is useful for storing an array of boolean values.

d2ce27dd

2013-06-24T23:16:06

Add public API for pathspec matching This adds a new public API for compiling pathspecs and matching them against the working directory, the index, or a tree from the repository. This also reworks the pathspec internals to allow the sharing of code between the existing internal usage of pathspec matching and the new external API. While this is working and the new API is ready for discussion, I think there is still an incorrect behavior in which patterns are always matched against the full path of an entry without taking the subdirectories into account (so "s*" will match "subdir/file" even though it wouldn't with core Git). Further enhancements are coming, but this was a good place to take a functional snapshot.

b8cd7aa9

2013-07-09T17:20:55

Merge pull request #1704 from arrbee/kill-status-index-then-workdir Remove GIT_STATUS_SHOW_INDEX_THEN_WORKDIR option

77fa06f3

2013-07-09T17:20:36

Merge pull request #1695 from arrbee/fix-1695 API should not be ifdeffed

7b5c0d18

2013-07-09T16:45:23

Add more tests for git_config_get_multivar The old tests didn't try failing lookups or lookups across multiple config files with some having the pattern and some not having it.

290e1479

2013-07-09T16:17:41

Add GIT_CAP_SSH if library was built with SSH This also adds a test that actually calls git_libgit2_capabilities and git_libgit2_version.

a5f9b5f8

2013-07-05T16:59:38

Diff hunk context off by one on long lines The diff hunk context string that is returned to xdiff need not be NUL terminated because the xdiff code just copies the number of bytes that you report directly into the output. There was an off by one in the diff driver code when the header context was longer than the output buffer size, the output buffer length included the NUL byte which was copied into the hunk header. Fixes #1710

2a16914c

2013-07-03T12:20:34

Remove GIT_STATUS_SHOW_INDEX_THEN_WORKDIR option This option serves no benefit now that the git_status_list API is available. It was of questionable value before and now it would just be a bad idea to use it rather than the indexed API.

9b6075b2

2013-07-03T17:07:20

Fix segfault in git_status_foreach_ext() Add tests for the `GIT_STATUS_SHOW_XXX` flags.

d90390c1

2013-06-29T13:38:27

test: Fix memory leak

c4ac556e

2013-06-29T12:48:58

Fix compilation warnings

f2c41884

2013-06-27T22:48:46

Merge pull request #1688 from arrbee/submodule-load-ignore-orphaned-head Test submodules with empty index or orphaned head

1e9dd60f

2013-06-27T22:29:05

Test submodules with empty index or orphaned head In both of these cases, the submodule data should still be loaded just (obviously) without the data that comes from either the index or the HEAD. This fixes a bug in the orphaned head case.

c67ff958

2013-06-27T07:38:27

Fix bug marking submodule diffs as unmodified There was a bug where submodules whose HEAD had not been moved were being marked as having an UNMODIFIED delta record instead of being left MODIFIED. This fixes that and fixes the tests to notice if a submodule has been incorrectly marked as UNMODIFIED.

c7974b49

2013-06-26T12:03:33

Fail on unmodified deltas when they're unexpected

b0401c68

2013-06-25T16:36:50

Merge pull request #1681 from arthurschreiber/patch-1 Prefer younger merge bases over older ones.

24ba6d3f

2013-06-25T22:55:13

Add a test case.

edbaa63a

2013-06-25T09:04:04

Unbreak git_remote_ls on a local transport after disconnecting.

c0e58e43

2013-06-25T00:12:19

test-rename: This is not a decimal, silly

f3f4c6b5

2013-06-24T11:56:35

Fix checkout tests on Windows

d4f98ba4

2013-06-21T12:29:03

Addition checkout target directory tests This adds additonal tests of the checkout target directory option including using it to dump data from bare repos.

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.

dacce80b

2013-06-20T19:05:38

test asserting checkout should not recreate deleted files

94ef2a35

2013-06-20T15:15:10

Add test for fixed diff bug Add test for bug fixed in 852ded96982ae70acb63c3940fae08ea29e40fee Sorry, I wrote that bug fix and forgot to check in a test at the same time. Here is one that fails on the old version of the code and now works.

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.

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.

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.

3b334075

2013-06-17T17:39:59

test illustrating tri-cyclic rename failure

f0f2ff9c

2013-06-17T17:33:40

test failure when renames produce similar similarities

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.

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

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.

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

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

519072c9

2013-06-14T14:02:00

diff: fix warning

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

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.

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.

947fad4f

2013-06-03T09:28:58

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

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.

9afc5971

2013-05-31T03:09:38

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

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.

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

ca9b1702

2013-05-29T09:18:21

Fix memory leak in oid shortener tests

56960b83

2013-05-28T20:47:55

Liike this

0582ae6f

2013-05-21T13:56:40

tests: don't verify SSH unsupported with GIT_SSH

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.

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

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

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.

thodg/libgit2/tests-clar

tests-clar

Log