kmx git

Commit	Date	Message
df341926	2014-05-12T10:51:56	Merge pull request #2336 from libgit2/rb/unicode-branch-names Pass unconverted Unicode path data when iconv doesn't like it
af567e88	2014-05-12T10:44:13	Merge pull request #2334 from libgit2/rb/fix-2333 Be more careful with user-supplied buffers
ce3b71d9	2014-05-12T10:28:45	Don't scale diff stat when not needed
7bcced44	2014-05-12T10:15:30	Merge pull request #2300 from libgit2/cmn/match-host-tests Some improvements to the cert checking
d2c4d1c6	2014-05-12T10:04:52	Merge pull request #2188 from libgit2/cmn/config-snapshot Configuration snapshotting
e18d5e52	2014-05-09T08:59:59	Merge pull request #2331 from libgit2/rb/dont-stop-diff-on-safecrlf Add filter options and ALLOW_UNSAFE
bb45e390	2014-05-08T15:01:07	Disable threads::refdb::edit_while_iterate test It seems that with the various recent changes to reference updating and reflog writing, that the thread safety of refdb updates has been reduced (either that or it was never thread safe and the window for error has increased). Either way, this test is now sometimes segfaulting which is no good, so let's disable the test for now. We don't really make any public promises about thread safety for this type of operation, so I think this is acceptable, at least in the short term.
8a2ef218	2014-05-08T14:48:27	Don't always test composed-insensitive lookups Only on a filesystem that is composed/decomposed insensitive, should be testing that a branch can be looked up by the opposite form and still work correctly.
be20ac5a	2014-05-08T14:33:37	Allow cl_repo_get_bool to work with missing key One of the test helpers provides a quick way for looking up a boolean key. But if the key way missing completely, the check would actually raise an error. Given the way we use this helper, if the key is missing, this should just return false, I think.
43a04135	2014-05-08T13:52:46	Pass unconverted data when iconv doesn't like it When using Iconv to convert unicode data and iconv doesn't like the source data (because it thinks that it's not actual UTF-8), instead of stopping the operation, just use the unconverted data. This will generally do the right thing on the filesystem, since that is the source of the non-UTF-8 path data anyhow. This adds some tests for creating and looking up branches with messy Unicode names. Also, this takes the helper function that was previously internal to `git_repository_init` and makes it into `git_path_does_fs_decompose_unicode` which is a useful in tests to understand what the expected results should be.
1e4976cb	2014-05-08T10:17:14	Be more careful with user-supplied buffers This adds in missing calls to `git_buf_sanitize` and fixes a number of places where `git_buf` APIs could inadvertently write NUL terminator bytes into invalid buffers. This also changes the behavior of `git_buf_sanitize` to NUL terminate a buffer if it can and of `git_buf_shorten` to do nothing if it can. Adds tests of filtering code with zeroed (i.e. unsanitized) buffer which was previously triggering a segfault.
5269008c	2014-05-06T16:01:49	Add filter options and ALLOW_UNSAFE Diff and status do not want core.safecrlf to actually raise an error regardless of the setting, so this extends the filter API with an additional options flags parameter and adds a flag so that filters can be applied with GIT_FILTER_OPT_ALLOW_UNSAFE, indicating that unsafe filter application should be downgraded from a failure to a warning.
ee311907	2014-05-05T16:04:14	odb: ignore files in the objects dir We assume that everything under GIT_DIR/objects/ is a directory. This is not necessarily the case if some process left a stray file in there. Check beforehand if we do have a directory and ignore the entry otherwise.
272b462d	2014-05-02T09:50:15	Merge pull request #2308 from libgit2/rb/diff-update-index-stat-cache Reduce excessive OID calculation for diff and stat
9862ef8e	2014-05-02T09:42:07	Merge pull request #2310 from libgit2/cmn/commit-create-safe commit: safer commit creation with reference update
99dfa470	2014-05-01T15:12:12	Some further sandboxing cleanups to tests Trying to find other issues where tests may not clean up quite properly when they are through...
0f603132	2014-05-01T14:47:33	Improve handling of fake home directory There are a few tests that set up a fake home directory and a fake GLOBAL search path so that we can test things in global ignore or attribute or config files. This cleans up that code to work more robustly even if there is a test failure. This also fixes some valgrind warnings where scanning search paths for separators could end up doing a little bit of sketchy data access when coming to the end of search list.
bc91347b	2014-04-30T11:16:31	Fix remaining init_options inconsistencies There were a couple of "init_opts()" functions a few more cases of structure initialization that I somehow missed.
9c8ed499	2014-04-29T15:05:58	Remove trace / add git_diff_perfdata struct + api
7a2e56a3	2014-04-29T14:30:15	Get rid of redundant git_diff_options_init fn Since git_diff_init_options was introduced, remove this old fn.
b23b112d	2014-04-29T11:29:49	Add payloads, bitmaps to trace API This is a proposed adjustment to the trace APIs. This makes the trace levels into a bitmask so that they can be selectively enabled and adds a callback-level payload, plus a message-level payload. This makes it easier for me to a GIT_TRACE_PERF callbacks that are simply bypassed if the PERF level is not set.
225aab5d	2014-04-28T16:47:39	Don't use trace if GIT_TRACE not defined
cd424ad5	2014-04-28T16:39:53	Add GIT_STATUS_OPT_UPDATE_INDEX and use trace API This adds an option to refresh the stat cache while generating status. It also rips out the GIT_PERF stuff I had an makes use of the trace API to keep statistics about what happens during diff.
94fb4aad	2014-04-28T14:48:41	Add diff option to update index stat cache When diff is scanning the working directory, if it finds a file where it is not sure if the index entry matches the working dir, it will recalculate the OID (which is pretty expensive). This adds a new flag to diff so that if the OID calculation finds that the file actually has not changed (i.e. just the modified time was altered or such), then it will refresh the stat cache in the index so that future calls to diff will not have to check the oid again.
8ef4e11a	2014-04-28T14:16:26	Skip diff oid calc when size definitely changed When we think the stat cache in the index seems valid and the size or mode of a file has definitely changed, then don't bother trying to recalculate the OID of the workdir bits to confirm that it is modified - just accept that it is modified. This can result in files that show as modified with no actual diff, but the behavior actually appears to match Git on the command line. This also includes a minor optimization to not perform a submodule lookup on the ".git" directory itself.
240f4af3	2014-04-28T14:04:29	Add build option for diff internal statistics
d19b2f9f	2014-05-01T12:46:46	Make pattern eat trailing slash This allows "foo//*.html" to match "foo/file.html"
217c029b	2014-04-09T14:08:22	commit: safer commit creation with reference update The current version of the commit creation and amend function are unsafe to use when passing the update_ref parameter, as they do not check that the reference at the moment of update points to what the user expects. Make sure that we're moving history forward when we ask the library to update the reference for us by checking that the first parent of the new commit is the current value of the reference. We also make sure that the ref we're updating hasn't moved between the read and the write. Similarly, when amending a commit, make sure that the current tip of the branch is the commit we're amending.
1f0d4f3d	2014-04-26T13:51:14	netops: unit-test the cert host-name pattern matching This kind of stuff should have unit tests, even if it's just to show what we expect to match successfully.
7b8d564d	2014-04-25T15:49:58	Reset tests: Use sandboxed index
8443ed6c	2014-04-25T02:10:19	Merge pull request #2284 from jacquesg/push-progress-callback Fire progress and update tips callbacks also for pushes.
332e4f20	2014-04-25T02:07:42	Merge pull request #2297 from libgit2/rb/status-with-precomposed-changes Improve test coverage of status with different core.precomposeunicode settings
2ad51b81	2014-04-25T02:04:12	Merge pull request #2241 from libgit2/rb/stash-skip-submodules Improve stash and checkout for ignored + untracked items
af9eeac9	2014-04-24T16:20:08	Merge pull request #2294 from ethomson/merge_checkout_strategy Merge checkout strategy
6b833e3a	2014-04-24T15:40:50	Improve docs for status rename detection limits and make tests empty on platforms without iconv support.
f608f3bb	2014-04-24T15:25:01	Test toggling core.precomposeunicode yields rename There is an interesting difference with core Git here, though. Because libgit2 will do rename detection with the working directory, in the last case where the HEAD and the working directory both have the decomposed data and the index has the composed data, we generate a single status record with two renames whereas Git will generate one rename (head to index) and one untracked file.
2334e3d8	2014-04-24T14:46:59	Test decomposed unicode renames work as expected
bdc82e1c	2014-04-24T14:08:29	fetchhead: deal with quotes in branch names The current FETCH_HEAD parsing code assumes that a quote must end the branch name. Git however allows for quotes as part of a branch name, which causes us to consider the FETCH_HEAD file as invalid. Instead of searching for a single quote char, search for a quote char followed by SP, which is not a valid part of a ref name.
a4e2c36a	2014-04-23T19:40:21	merge: checkout default shouldn't clobber given
26564d80	2014-04-23T19:26:58	merge: default checkout strategy for should be SAFE
212b6205	2014-04-23T09:27:15	Merge pull request #2291 from ethomson/patch_binary patch: emit deflated binary patches (optionally)
5ca410b9	2014-04-23T07:13:49	Merge pull request #2283 from phkelley/win32_fs Win32: UTF-8 <-> WCHAR conversion overhaul
7110000d	2014-04-22T10:21:19	React to feedback for UTF-8 <-> WCHAR and reparse work
37da3685	2014-04-22T21:51:54	Make checkout match diff for untracked/ignored dir When diff finds an untracked directory, it emulates Git behavior by looking inside the directory to see if there are any untracked items inside it. If there are only ignored items inside the dir, then diff considers it ignored, even if there is no direct ignore rule for it. Checkout was not copying this behavior - when it found an untracked directory, it just treated it as untracked. Unfortunately, when combined with GIT_CHECKOUT_REMOVE_UNTRACKED, this made is seem that checkout (and stash, which uses checkout) was removing ignored items when you had only asked it to remove untracked ones. This commit moves the logic for advancing past an untracked dir while scanning for non-ignored items into an iterator helper fn, and uses that for both diff and checkout.
e349ed50	2014-04-22T14:58:33	patch: emit binary patches (optionally)
3c1aa4c1	2014-04-22T15:23:39	Failing test for stashing a buried ignored file
24d17de2	2014-04-02T12:07:27	Make stash and checkout ignore contained repos To emulate git, stash should not remove untracked git repositories inside the parent repo, and checkout's REMOVE_UNTRACKED should also skip over these items. `git stash` actually prints a warning message for these items. That should be possible with a checkout notify callback if you wanted to, although it would require a bit of extra logic as things are at the moment.
8d09efa2	2014-04-22T12:33:27	Use git_diff_get_stats in example/diff + refactor This takes the `--stat` and related example options in the example diff.c program and converts them to use the `git_diff_get_stats` API which nicely formats stats for you. I went to add bar-graph scaling to the stats formatter and noticed that the `git_diff_stats` structure was holding on to all of the `git_patch` objects. Unfortunately, each of these objects keeps the full text of the diff in memory, so this is very expensive. I ended up modifying `git_diff_stats` to keep just the data that it needs to keep and allowed it to release the patches. Then, I added width scaling to the output on top of that. In making the diff example program match 'git diff' output, I ended up removing an newline from the sumamry output which I then had to compensate for in the email formatting to match the expectations. Lastly, I went through and refactored the tests to use a couple of helper functions and reduce the overall amount of code there.
65477db1	2014-04-21T23:32:31	Handle win32 reparse points properly
bd101a7e	2014-04-21T11:54:54	Fix reset for staged deletes
f70cfd34	2014-04-21T17:49:38	Verify update_tips callbacks in push test cases
c2c81615	2014-04-19T18:05:31	Win32: UTF-8 <-> WCHAR conversion overhaul
7b0f8ba9	2014-04-19T13:05:32	Merge pull request #2279 from libgit2/rb/moar-eegnöre-fîxés Fix several ignore and attribute file behavior bugs
916fcbd6	2014-04-18T14:42:40	Fix ignore difference from git with trailing /* Ignore patterns that ended with a trailing '/' were still needing to match against another actual '/' character in the full path. This is not the same behavior as core Git. Instead, we strip a trailing '/' off of any patterns that were matching and just take it to imply the FNM_LEADING_DIR behavior.
e3a2a04c	2014-04-18T14:29:58	Preload attribute files that may contain macros There was a latent bug where files that use macro definitions could be parsed before the macro definitions were loaded. Because of attribute file caching, preloading files that are going to be used doesn't add a significant amount of overhead, so let's always preload any files that could contain macros before we assemble the actual vector of files to scan for attributes.
50e46d60	2014-04-18T10:58:01	Cleanup tests with helper functions
6a0956e5	2014-04-18T10:32:35	Pop ignore only if whole relative path matches When traversing the directory structure, the iterator pushes and pops ignore files using a vector. Some directories don't have ignore files, so it uses a path comparison to decide when it is right to actually pop the last ignore file. This was only comparing directory suffixes, though, so a subdirectory with the same name as a parent could result in the parent's .gitignore being popped off the list ignores too early. This changes the logic to compare the entire relative path of the ignore file.
386777fd	2014-04-18T09:26:38	Merge pull request #2213 from ethomson/safecrlf Introduce core.safecrlf handling
8c1f4ab4	2014-04-09T12:26:53	config: refresh on delete When we delete an entry, we also want to refresh the configuration to catch any changes that happened externally. This allows us to simplify the logic, as we no longer need to delete these variables internally. The whole state will be refreshed and the deleted entries won't be there.
523032cd	2014-03-31T09:58:44	config: refresh before reading a value With the isolation of complex reads, we can now try to refresh the on-disk file before reading a value from it. This changes the semantics a bit, as before we could be sure that a string we got from the configuration was valid until we wrote or refreshed. This is no longer the case, as a read can also invalidate the pointer.
eaf37034	2014-03-31T08:53:56	config: refresh the values on write When writing out, parse the resulting file instead of adding or replacing the value locally. This has the effect of reading external changes as well.
55ebd7d3	2014-03-13T17:11:34	config: implement config snapshotting In order to have consistent views of the config files for remotes, submodules et al. and a configuration that represents what is currently stored on-disk, we need a way to provide a view of the configuration that does not change. The goal here is to provide the snapshotting part by creating a read-only copy of the state of the configuration at a particular point in time, which does not change when a repository's main config changes.
36913b8c	2014-03-06T15:11:11	config: document current write behaviour in a test On set, we set/add the value written to the config's internal values, but we do not refresh old values. Document this in a test in preparation for the refresh changes.
83038272	2014-04-17T14:35:29	Some memory leak fixes
823c0e9c	2014-04-17T11:53:13	Fix broken logic for attr cache invalidation The checks to see if files were out of date in the attibute cache was wrong because the cache-breaker data wasn't getting stored correctly. Additionally, when the cache-breaker triggered, the old file data was being leaked.
ea642d61	2014-04-14T12:29:27	Fix race checking for existing index items In the threading tests, I was still seeing a race condition where the same item could end up being inserted multiple times into the index. Preserving the sorted-ness of the index outside of the `index_insert` call fixes the issue.
7d490872	2014-04-10T22:31:01	Attribute file cache refactor This is a big refactoring of the attribute file cache to be a bit simpler which in turn makes it easier to enforce a lock around any updates to the cache so that it can be used in a threaded env. Tons of changes to the attributes and ignores code.
3816debc	2014-03-14T14:51:04	Fix threading tests when threads disabled
8a2834d3	2014-03-14T13:20:51	Index locking and entry allocation changes This makes the lock management on the index a little bit broader, having a number of routines hold the lock across looking up the item to be modified and actually making the modification. Still not true thread safety, but more pure index modifications are now safe which allows the simple cases (such as starting up a diff while index modifications are underway) safe enough to get the snapshot without hitting allocation problems. As part of this, I simplified the allocation of index entries to use a flex array and just put the path at the end of the index entry. This makes every entry self-contained and makes it a little easier to feel sure that pointers to strings aren't being accidentally copied and freed while other references are still being held.
40ed4990	2014-02-11T14:45:37	Add diff threading tests and attr file cache locks This adds a basic test of doing simultaneous diffs on multiple threads and adds basic locking for the attr file cache because that was the immediate problem that arose from these tests.
3b4c401a	2014-02-10T13:20:08	Decouple index iterator sort from index This makes the index iterator honor the GIT_ITERATOR_IGNORE_CASE and GIT_ITERATOR_DONT_IGNORE_CASE flags without modifying the index data itself. To take advantage of this, I had to export a number of the internal index entry comparison functions. I also wrote some new tests to exercise the capability.
27e54bcf	2014-02-07T14:17:19	Add public diff print helpers The usefulness of these helpers came up for me while debugging some of the iterator changes that I was making, so since they have also been requested (albeit indirectly) I thought I'd include them.
c67fd4c9	2014-02-07T11:20:36	Some vector utility tweaks This is just laying some groundwork for internal index changes that I'm working on.
c5cacc4e	2014-04-16T19:09:35	Merge pull request #2261 from jacquesg/format-patch Support for format-patch
fa13ee2d	2014-04-16T16:59:43	Add GIT_BRANCH_ALL to git_branch_t enum git_branch_t is an enum so requesting GIT_BRANCH_LOCAL \| GIT_BRANCH_REMOTE is not possible as it is not a member of the enum (at least VS2013 C++ complains about it). This fixes a regression introduced in commit a667ca8298193b3103c1dbdcb1f6c527e6e99eb2 (PR #1946). Signed-off-by: Sven Strickroth <email@cs-ware.de>
37ab5ecc	2014-04-16T10:51:25	Merge pull request #2269 from libgit2/rb/fix-leading-slash-ignores Fix core.excludesfile named .gitignore
0f7aa47d	2014-04-15T20:26:23	Merge pull request #2235 from jacquesg/cherry-pick Add cherry pick support
39206ca2	2014-04-14T17:12:56	Added a test case for formatting a binary patch e-mail
a56b418d	2014-04-11T22:57:15	Sanitize git_diff_format_email_options' summary parameter It will form part of the subject line and should thus be one line.
d8cc1fb6	2014-04-11T19:15:15	Introduce git_diff_format_email and git_diff_commit_as_email
360314c9	2014-04-11T19:03:29	Introduce git_diff_get_stats, git_diff_stats_files_changed, git_diff_stats_insertions, git_diff_stats_deletions and git_diff_stats_to_buf
cab39378	2014-04-11T19:14:18	Added git_diff_stats test files
a9528b8f	2014-04-14T15:59:48	Fix core.excludesfile named .gitignore Ignore rules with slashes in them are matched using FNM_PATHNAME and use the path to the .gitignore file from the root of the repository along with the path fragment (including slashes) in the ignore file itself. Unfortunately, the relative path to the .gitignore file was being applied to the global core.excludesfile if that was also named ".gitignore". This fixes that with more precise matching and includes test for ignore rules with leading slashes (which were the primary example of this being broken in the real world). This also backports an improvement to the file context logic from the threadsafe-iterators branch where we don't rely on mutating the key of the attribute file name to generate the context path.
289e31cd	2014-04-14T23:11:06	Merge pull request #2264 from jacquesg/fix-warnings Correct C90 warnings
6fefb7af	2014-04-13T19:53:35	Capture conflict information in MERGE_MSG for revert and merge
103b7d21	2014-04-02T13:57:11	Added cherry pick tests
06d772d8	2014-04-14T14:49:01	Merge pull request #2262 from libgit2/rb/fix-ignore-pop Fix bug popping ignore files during wd iteration
efaa342c	2014-04-11T22:07:49	Correct C90 warnings
51297cad	2014-04-10T12:44:12	Added RFC2822 date format test cases
8f7bc646	2014-04-10T16:33:39	Fix bug popping ignore files during wd iteration There were a couple bugs in popping ignore files during iteration that could result in incorrect decisions be made and thus ignore files below the root either not being loaded correctly or not being popped at the right time. One bug was an off-by-one in comparing the path of the gitignore file with the path being exited during iteration. The second bug was not correctly truncating the path being tracked during traversal if there were no ignores on the list (i.e. when you have no .gitignore at the root, but do have some in contained directories).
bcc62293	2014-04-09T12:45:49	Merge pull request #2259 from libgit2/vmg/state-cleanup Rewrite `state-cleanup`
eb7e17cc	2014-04-08T14:47:20	Update submodules with parent-tracked content This updates how libgit2 treats submodule-like directories that actually have tracked content inside of them. This is a strange corner case, but it seems that many people have abortive submodule setups and then just went ahead and added the files into the parent repository. In this case, we should just treat the submodule as if it was a normal directory. Libgit2 will still try to skip over real submodules and contained repositories that do not have tracked files inside them, but this adds some new handling for cases where the apparently submodule data is in conflict with the actual list of tracked files.
2795fb4d	2014-04-08T16:37:39	Merge pull request #2256 from jacquesg/graph-descendant Correct grouping of parentheses
8a8e3127	2014-04-08T16:20:49	Added a no path test for git_graph_descendant_of
855c66de	2014-03-27T16:34:20	Introduce core.safecrlf handling
c813b345	2014-04-07T11:45:32	Fix bug with multiple iconv conversions in one dir The internal buffer in the `git_path_iconv_t` structure was not being reset before the calls to `iconv` were made to convert data, so if there were multiple decomposed Unicode paths in a single directory, paths after the first one were being appended to the first instead of treated as independent data.
c0311295	2014-04-07T17:32:23	git_repository_state_cleanup() should remove rebase-merge/, rebase-apply/ and BISECT_LOG
c8c91433	2014-04-06T10:42:26	More ** tests for pattern rules
2b6b85f1	2014-04-04T17:02:12	Add support for matches in ignores This is an experimental addition to add support to fnmatch pattern matching in libgit2. It needs more testing.
923c8400	2014-04-04T14:24:08	Merge pull request #2215 from libgit2/rb/submodule-cache-fixes Improve submodule cache management

df341926

2014-05-12T10:51:56

Merge pull request #2336 from libgit2/rb/unicode-branch-names Pass unconverted Unicode path data when iconv doesn't like it

af567e88

2014-05-12T10:44:13

Merge pull request #2334 from libgit2/rb/fix-2333 Be more careful with user-supplied buffers

ce3b71d9

2014-05-12T10:28:45

Don't scale diff stat when not needed

7bcced44

2014-05-12T10:15:30

Merge pull request #2300 from libgit2/cmn/match-host-tests Some improvements to the cert checking

d2c4d1c6

2014-05-12T10:04:52

Merge pull request #2188 from libgit2/cmn/config-snapshot Configuration snapshotting

e18d5e52

2014-05-09T08:59:59

Merge pull request #2331 from libgit2/rb/dont-stop-diff-on-safecrlf Add filter options and ALLOW_UNSAFE

bb45e390

2014-05-08T15:01:07

Disable threads::refdb::edit_while_iterate test It seems that with the various recent changes to reference updating and reflog writing, that the thread safety of refdb updates has been reduced (either that or it was never thread safe and the window for error has increased). Either way, this test is now sometimes segfaulting which is no good, so let's disable the test for now. We don't really make any public promises about thread safety for this type of operation, so I think this is acceptable, at least in the short term.

8a2ef218

2014-05-08T14:48:27

Don't always test composed-insensitive lookups Only on a filesystem that is composed/decomposed insensitive, should be testing that a branch can be looked up by the opposite form and still work correctly.

be20ac5a

2014-05-08T14:33:37

Allow cl_repo_get_bool to work with missing key One of the test helpers provides a quick way for looking up a boolean key. But if the key way missing completely, the check would actually raise an error. Given the way we use this helper, if the key is missing, this should just return false, I think.

43a04135

2014-05-08T13:52:46

Pass unconverted data when iconv doesn't like it When using Iconv to convert unicode data and iconv doesn't like the source data (because it thinks that it's not actual UTF-8), instead of stopping the operation, just use the unconverted data. This will generally do the right thing on the filesystem, since that is the source of the non-UTF-8 path data anyhow. This adds some tests for creating and looking up branches with messy Unicode names. Also, this takes the helper function that was previously internal to `git_repository_init` and makes it into `git_path_does_fs_decompose_unicode` which is a useful in tests to understand what the expected results should be.

1e4976cb

2014-05-08T10:17:14

Be more careful with user-supplied buffers This adds in missing calls to `git_buf_sanitize` and fixes a number of places where `git_buf` APIs could inadvertently write NUL terminator bytes into invalid buffers. This also changes the behavior of `git_buf_sanitize` to NUL terminate a buffer if it can and of `git_buf_shorten` to do nothing if it can. Adds tests of filtering code with zeroed (i.e. unsanitized) buffer which was previously triggering a segfault.

5269008c

2014-05-06T16:01:49

Add filter options and ALLOW_UNSAFE Diff and status do not want core.safecrlf to actually raise an error regardless of the setting, so this extends the filter API with an additional options flags parameter and adds a flag so that filters can be applied with GIT_FILTER_OPT_ALLOW_UNSAFE, indicating that unsafe filter application should be downgraded from a failure to a warning.

ee311907

2014-05-05T16:04:14

odb: ignore files in the objects dir We assume that everything under GIT_DIR/objects/ is a directory. This is not necessarily the case if some process left a stray file in there. Check beforehand if we do have a directory and ignore the entry otherwise.

272b462d

2014-05-02T09:50:15

Merge pull request #2308 from libgit2/rb/diff-update-index-stat-cache Reduce excessive OID calculation for diff and stat

9862ef8e

2014-05-02T09:42:07

Merge pull request #2310 from libgit2/cmn/commit-create-safe commit: safer commit creation with reference update

99dfa470

2014-05-01T15:12:12

Some further sandboxing cleanups to tests Trying to find other issues where tests may not clean up quite properly when they are through...

0f603132

2014-05-01T14:47:33

Improve handling of fake home directory There are a few tests that set up a fake home directory and a fake GLOBAL search path so that we can test things in global ignore or attribute or config files. This cleans up that code to work more robustly even if there is a test failure. This also fixes some valgrind warnings where scanning search paths for separators could end up doing a little bit of sketchy data access when coming to the end of search list.

bc91347b

2014-04-30T11:16:31

Fix remaining init_options inconsistencies There were a couple of "init_opts()" functions a few more cases of structure initialization that I somehow missed.

9c8ed499

2014-04-29T15:05:58

Remove trace / add git_diff_perfdata struct + api

7a2e56a3

2014-04-29T14:30:15

Get rid of redundant git_diff_options_init fn Since git_diff_init_options was introduced, remove this old fn.

b23b112d

2014-04-29T11:29:49

Add payloads, bitmaps to trace API This is a proposed adjustment to the trace APIs. This makes the trace levels into a bitmask so that they can be selectively enabled and adds a callback-level payload, plus a message-level payload. This makes it easier for me to a GIT_TRACE_PERF callbacks that are simply bypassed if the PERF level is not set.

225aab5d

2014-04-28T16:47:39

Don't use trace if GIT_TRACE not defined

cd424ad5

2014-04-28T16:39:53

Add GIT_STATUS_OPT_UPDATE_INDEX and use trace API This adds an option to refresh the stat cache while generating status. It also rips out the GIT_PERF stuff I had an makes use of the trace API to keep statistics about what happens during diff.

94fb4aad

2014-04-28T14:48:41

Add diff option to update index stat cache When diff is scanning the working directory, if it finds a file where it is not sure if the index entry matches the working dir, it will recalculate the OID (which is pretty expensive). This adds a new flag to diff so that if the OID calculation finds that the file actually has not changed (i.e. just the modified time was altered or such), then it will refresh the stat cache in the index so that future calls to diff will not have to check the oid again.

8ef4e11a

2014-04-28T14:16:26

Skip diff oid calc when size definitely changed When we think the stat cache in the index seems valid and the size or mode of a file has definitely changed, then don't bother trying to recalculate the OID of the workdir bits to confirm that it is modified - just accept that it is modified. This can result in files that show as modified with no actual diff, but the behavior actually appears to match Git on the command line. This also includes a minor optimization to not perform a submodule lookup on the ".git" directory itself.

240f4af3

2014-04-28T14:04:29

Add build option for diff internal statistics

d19b2f9f

2014-05-01T12:46:46

Make ** pattern eat trailing slash This allows "foo/**/*.html" to match "foo/file.html"

217c029b

2014-04-09T14:08:22

commit: safer commit creation with reference update The current version of the commit creation and amend function are unsafe to use when passing the update_ref parameter, as they do not check that the reference at the moment of update points to what the user expects. Make sure that we're moving history forward when we ask the library to update the reference for us by checking that the first parent of the new commit is the current value of the reference. We also make sure that the ref we're updating hasn't moved between the read and the write. Similarly, when amending a commit, make sure that the current tip of the branch is the commit we're amending.

1f0d4f3d

2014-04-26T13:51:14

netops: unit-test the cert host-name pattern matching This kind of stuff should have unit tests, even if it's just to show what we expect to match successfully.

7b8d564d

2014-04-25T15:49:58

Reset tests: Use sandboxed index

8443ed6c

2014-04-25T02:10:19

Merge pull request #2284 from jacquesg/push-progress-callback Fire progress and update tips callbacks also for pushes.

332e4f20

2014-04-25T02:07:42

Merge pull request #2297 from libgit2/rb/status-with-precomposed-changes Improve test coverage of status with different core.precomposeunicode settings

2ad51b81

2014-04-25T02:04:12

Merge pull request #2241 from libgit2/rb/stash-skip-submodules Improve stash and checkout for ignored + untracked items

af9eeac9

2014-04-24T16:20:08

Merge pull request #2294 from ethomson/merge_checkout_strategy Merge checkout strategy

6b833e3a

2014-04-24T15:40:50

Improve docs for status rename detection limits and make tests empty on platforms without iconv support.

f608f3bb

2014-04-24T15:25:01

Test toggling core.precomposeunicode yields rename There is an interesting difference with core Git here, though. Because libgit2 will do rename detection with the working directory, in the last case where the HEAD and the working directory both have the decomposed data and the index has the composed data, we generate a single status record with two renames whereas Git will generate one rename (head to index) and one untracked file.

2334e3d8

2014-04-24T14:46:59

Test decomposed unicode renames work as expected

bdc82e1c

2014-04-24T14:08:29

fetchhead: deal with quotes in branch names The current FETCH_HEAD parsing code assumes that a quote must end the branch name. Git however allows for quotes as part of a branch name, which causes us to consider the FETCH_HEAD file as invalid. Instead of searching for a single quote char, search for a quote char followed by SP, which is not a valid part of a ref name.

a4e2c36a

2014-04-23T19:40:21

merge: checkout default shouldn't clobber given

26564d80

2014-04-23T19:26:58

merge: default checkout strategy for should be SAFE

212b6205

2014-04-23T09:27:15

Merge pull request #2291 from ethomson/patch_binary patch: emit deflated binary patches (optionally)

5ca410b9

2014-04-23T07:13:49

Merge pull request #2283 from phkelley/win32_fs Win32: UTF-8 <-> WCHAR conversion overhaul

7110000d

2014-04-22T10:21:19

React to feedback for UTF-8 <-> WCHAR and reparse work

37da3685

2014-04-22T21:51:54

Make checkout match diff for untracked/ignored dir When diff finds an untracked directory, it emulates Git behavior by looking inside the directory to see if there are any untracked items inside it. If there are only ignored items inside the dir, then diff considers it ignored, even if there is no direct ignore rule for it. Checkout was not copying this behavior - when it found an untracked directory, it just treated it as untracked. Unfortunately, when combined with GIT_CHECKOUT_REMOVE_UNTRACKED, this made is seem that checkout (and stash, which uses checkout) was removing ignored items when you had only asked it to remove untracked ones. This commit moves the logic for advancing past an untracked dir while scanning for non-ignored items into an iterator helper fn, and uses that for both diff and checkout.

e349ed50

2014-04-22T14:58:33

patch: emit binary patches (optionally)

3c1aa4c1

2014-04-22T15:23:39

Failing test for stashing a buried ignored file

24d17de2

2014-04-02T12:07:27

Make stash and checkout ignore contained repos To emulate git, stash should not remove untracked git repositories inside the parent repo, and checkout's REMOVE_UNTRACKED should also skip over these items. `git stash` actually prints a warning message for these items. That should be possible with a checkout notify callback if you wanted to, although it would require a bit of extra logic as things are at the moment.

8d09efa2

2014-04-22T12:33:27

Use git_diff_get_stats in example/diff + refactor This takes the `--stat` and related example options in the example diff.c program and converts them to use the `git_diff_get_stats` API which nicely formats stats for you. I went to add bar-graph scaling to the stats formatter and noticed that the `git_diff_stats` structure was holding on to all of the `git_patch` objects. Unfortunately, each of these objects keeps the full text of the diff in memory, so this is very expensive. I ended up modifying `git_diff_stats` to keep just the data that it needs to keep and allowed it to release the patches. Then, I added width scaling to the output on top of that. In making the diff example program match 'git diff' output, I ended up removing an newline from the sumamry output which I then had to compensate for in the email formatting to match the expectations. Lastly, I went through and refactored the tests to use a couple of helper functions and reduce the overall amount of code there.

65477db1

2014-04-21T23:32:31

Handle win32 reparse points properly

bd101a7e

2014-04-21T11:54:54

Fix reset for staged deletes

f70cfd34

2014-04-21T17:49:38

Verify update_tips callbacks in push test cases

c2c81615

2014-04-19T18:05:31

Win32: UTF-8 <-> WCHAR conversion overhaul

7b0f8ba9

2014-04-19T13:05:32

Merge pull request #2279 from libgit2/rb/moar-eegnöre-fîxés Fix several ignore and attribute file behavior bugs

916fcbd6

2014-04-18T14:42:40

Fix ignore difference from git with trailing /* Ignore patterns that ended with a trailing '/*' were still needing to match against another actual '/' character in the full path. This is not the same behavior as core Git. Instead, we strip a trailing '/*' off of any patterns that were matching and just take it to imply the FNM_LEADING_DIR behavior.

e3a2a04c

2014-04-18T14:29:58

Preload attribute files that may contain macros There was a latent bug where files that use macro definitions could be parsed before the macro definitions were loaded. Because of attribute file caching, preloading files that are going to be used doesn't add a significant amount of overhead, so let's always preload any files that could contain macros before we assemble the actual vector of files to scan for attributes.

50e46d60

2014-04-18T10:58:01

Cleanup tests with helper functions

6a0956e5

2014-04-18T10:32:35

Pop ignore only if whole relative path matches When traversing the directory structure, the iterator pushes and pops ignore files using a vector. Some directories don't have ignore files, so it uses a path comparison to decide when it is right to actually pop the last ignore file. This was only comparing directory suffixes, though, so a subdirectory with the same name as a parent could result in the parent's .gitignore being popped off the list ignores too early. This changes the logic to compare the entire relative path of the ignore file.

386777fd

2014-04-18T09:26:38

Merge pull request #2213 from ethomson/safecrlf Introduce core.safecrlf handling

8c1f4ab4

2014-04-09T12:26:53

config: refresh on delete When we delete an entry, we also want to refresh the configuration to catch any changes that happened externally. This allows us to simplify the logic, as we no longer need to delete these variables internally. The whole state will be refreshed and the deleted entries won't be there.

523032cd

2014-03-31T09:58:44

config: refresh before reading a value With the isolation of complex reads, we can now try to refresh the on-disk file before reading a value from it. This changes the semantics a bit, as before we could be sure that a string we got from the configuration was valid until we wrote or refreshed. This is no longer the case, as a read can also invalidate the pointer.

eaf37034

2014-03-31T08:53:56

config: refresh the values on write When writing out, parse the resulting file instead of adding or replacing the value locally. This has the effect of reading external changes as well.

55ebd7d3

2014-03-13T17:11:34

config: implement config snapshotting In order to have consistent views of the config files for remotes, submodules et al. and a configuration that represents what is currently stored on-disk, we need a way to provide a view of the configuration that does not change. The goal here is to provide the snapshotting part by creating a read-only copy of the state of the configuration at a particular point in time, which does not change when a repository's main config changes.

36913b8c

2014-03-06T15:11:11

config: document current write behaviour in a test On set, we set/add the value written to the config's internal values, but we do not refresh old values. Document this in a test in preparation for the refresh changes.

83038272

2014-04-17T14:35:29

Some memory leak fixes

823c0e9c

2014-04-17T11:53:13

Fix broken logic for attr cache invalidation The checks to see if files were out of date in the attibute cache was wrong because the cache-breaker data wasn't getting stored correctly. Additionally, when the cache-breaker triggered, the old file data was being leaked.

ea642d61

2014-04-14T12:29:27

Fix race checking for existing index items In the threading tests, I was still seeing a race condition where the same item could end up being inserted multiple times into the index. Preserving the sorted-ness of the index outside of the `index_insert` call fixes the issue.

7d490872

2014-04-10T22:31:01

Attribute file cache refactor This is a big refactoring of the attribute file cache to be a bit simpler which in turn makes it easier to enforce a lock around any updates to the cache so that it can be used in a threaded env. Tons of changes to the attributes and ignores code.

3816debc

2014-03-14T14:51:04

Fix threading tests when threads disabled

8a2834d3

2014-03-14T13:20:51

Index locking and entry allocation changes This makes the lock management on the index a little bit broader, having a number of routines hold the lock across looking up the item to be modified and actually making the modification. Still not true thread safety, but more pure index modifications are now safe which allows the simple cases (such as starting up a diff while index modifications are underway) safe enough to get the snapshot without hitting allocation problems. As part of this, I simplified the allocation of index entries to use a flex array and just put the path at the end of the index entry. This makes every entry self-contained and makes it a little easier to feel sure that pointers to strings aren't being accidentally copied and freed while other references are still being held.

40ed4990

2014-02-11T14:45:37

Add diff threading tests and attr file cache locks This adds a basic test of doing simultaneous diffs on multiple threads and adds basic locking for the attr file cache because that was the immediate problem that arose from these tests.

3b4c401a

2014-02-10T13:20:08

Decouple index iterator sort from index This makes the index iterator honor the GIT_ITERATOR_IGNORE_CASE and GIT_ITERATOR_DONT_IGNORE_CASE flags without modifying the index data itself. To take advantage of this, I had to export a number of the internal index entry comparison functions. I also wrote some new tests to exercise the capability.

27e54bcf

2014-02-07T14:17:19

Add public diff print helpers The usefulness of these helpers came up for me while debugging some of the iterator changes that I was making, so since they have also been requested (albeit indirectly) I thought I'd include them.

c67fd4c9

2014-02-07T11:20:36

Some vector utility tweaks This is just laying some groundwork for internal index changes that I'm working on.

c5cacc4e

2014-04-16T19:09:35

Merge pull request #2261 from jacquesg/format-patch Support for format-patch

fa13ee2d

2014-04-16T16:59:43

Add GIT_BRANCH_ALL to git_branch_t enum git_branch_t is an enum so requesting GIT_BRANCH_LOCAL | GIT_BRANCH_REMOTE is not possible as it is not a member of the enum (at least VS2013 C++ complains about it). This fixes a regression introduced in commit a667ca8298193b3103c1dbdcb1f6c527e6e99eb2 (PR #1946). Signed-off-by: Sven Strickroth <email@cs-ware.de>

37ab5ecc

2014-04-16T10:51:25

Merge pull request #2269 from libgit2/rb/fix-leading-slash-ignores Fix core.excludesfile named .gitignore

0f7aa47d

2014-04-15T20:26:23

Merge pull request #2235 from jacquesg/cherry-pick Add cherry pick support

39206ca2

2014-04-14T17:12:56

Added a test case for formatting a binary patch e-mail

a56b418d

2014-04-11T22:57:15

Sanitize git_diff_format_email_options' summary parameter It will form part of the subject line and should thus be one line.

d8cc1fb6

2014-04-11T19:15:15

Introduce git_diff_format_email and git_diff_commit_as_email

360314c9

2014-04-11T19:03:29

Introduce git_diff_get_stats, git_diff_stats_files_changed, git_diff_stats_insertions, git_diff_stats_deletions and git_diff_stats_to_buf

cab39378

2014-04-11T19:14:18

Added git_diff_stats test files

a9528b8f

2014-04-14T15:59:48

Fix core.excludesfile named .gitignore Ignore rules with slashes in them are matched using FNM_PATHNAME and use the path to the .gitignore file from the root of the repository along with the path fragment (including slashes) in the ignore file itself. Unfortunately, the relative path to the .gitignore file was being applied to the global core.excludesfile if that was also named ".gitignore". This fixes that with more precise matching and includes test for ignore rules with leading slashes (which were the primary example of this being broken in the real world). This also backports an improvement to the file context logic from the threadsafe-iterators branch where we don't rely on mutating the key of the attribute file name to generate the context path.

289e31cd

2014-04-14T23:11:06

Merge pull request #2264 from jacquesg/fix-warnings Correct C90 warnings

6fefb7af

2014-04-13T19:53:35

Capture conflict information in MERGE_MSG for revert and merge

103b7d21

2014-04-02T13:57:11

Added cherry pick tests

06d772d8

2014-04-14T14:49:01

Merge pull request #2262 from libgit2/rb/fix-ignore-pop Fix bug popping ignore files during wd iteration

efaa342c

2014-04-11T22:07:49

Correct C90 warnings

51297cad

2014-04-10T12:44:12

Added RFC2822 date format test cases

8f7bc646

2014-04-10T16:33:39

Fix bug popping ignore files during wd iteration There were a couple bugs in popping ignore files during iteration that could result in incorrect decisions be made and thus ignore files below the root either not being loaded correctly or not being popped at the right time. One bug was an off-by-one in comparing the path of the gitignore file with the path being exited during iteration. The second bug was not correctly truncating the path being tracked during traversal if there were no ignores on the list (i.e. when you have no .gitignore at the root, but do have some in contained directories).

bcc62293

2014-04-09T12:45:49

Merge pull request #2259 from libgit2/vmg/state-cleanup Rewrite `state-cleanup`

eb7e17cc

2014-04-08T14:47:20

Update submodules with parent-tracked content This updates how libgit2 treats submodule-like directories that actually have tracked content inside of them. This is a strange corner case, but it seems that many people have abortive submodule setups and then just went ahead and added the files into the parent repository. In this case, we should just treat the submodule as if it was a normal directory. Libgit2 will still try to skip over real submodules and contained repositories that do not have tracked files inside them, but this adds some new handling for cases where the apparently submodule data is in conflict with the actual list of tracked files.

2795fb4d

2014-04-08T16:37:39

Merge pull request #2256 from jacquesg/graph-descendant Correct grouping of parentheses

8a8e3127

2014-04-08T16:20:49

Added a no path test for git_graph_descendant_of

855c66de

2014-03-27T16:34:20

Introduce core.safecrlf handling

c813b345

2014-04-07T11:45:32

Fix bug with multiple iconv conversions in one dir The internal buffer in the `git_path_iconv_t` structure was not being reset before the calls to `iconv` were made to convert data, so if there were multiple decomposed Unicode paths in a single directory, paths after the first one were being appended to the first instead of treated as independent data.

c0311295

2014-04-07T17:32:23

git_repository_state_cleanup() should remove rebase-merge/, rebase-apply/ and BISECT_LOG

c8c91433

2014-04-06T10:42:26

More ** tests for pattern rules

2b6b85f1

2014-04-04T17:02:12

Add support for ** matches in ignores This is an experimental addition to add ** support to fnmatch pattern matching in libgit2. It needs more testing.

923c8400

2014-04-04T14:24:08

Merge pull request #2215 from libgit2/rb/submodule-cache-fixes Improve submodule cache management

thodg/libgit2/tests

tests

Log