kmx git

Commit	Date	Message
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.
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.
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.
0500a1ef	2014-03-31T08:32:45	config: use a snapshot for the iterator
bd95f836	2014-03-31T08:08:17	config: split out the refresh step This will be used by the writing commands in a later step.
c047317e	2014-03-18T17:54:32	config: make refresh atomic Current code sets the active map to a new one and builds it whilst it's active. This is a race condition with someone else trying to access the same config. Instead, let's build up our new map and swap the active and new one.
29c4cb09	2014-03-15T03:53:36	Use config snapshotting This way we can assume we have a consistent view of the config situation when we're looking up remote, branch, pack-objects, etc.
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.
28fd7206	2014-04-18T12:33:19	Merge pull request #2108 from libgit2/rb/threadsafe-index-iterator Make index iterator thread safe
2bed3553	2014-04-18T00:34:04	cherry-pick: terminate the commit id string We treat this as a NUL-terminated string, so make sure that we add the terminator.
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.
2e9d813b	2014-04-11T12:12:47	Fix tests with new attr cache code
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.
e6e8530a	2014-04-14T12:31:17	Lock attribute file while reparsing data I don't love this approach, but achieving thread-safety for attribute and ignore data while reloading files would require a larger rewrite in order to avoid this. If an attribute or ignore file is out of date, this holds a lock on the file while we are reloading the data so that another thread won't try to reload the data at the same time.
1fa17b5c	2014-03-14T22:01:30	Minor tree cache speedups While I was looking at the conflict cleanup code, I looked over at the tree cache code, since we clear the tree cache for each entry that gets removed and there is some redundancy there. I made some small tweaks to avoid extra calls to strchr and strlen in a few circumstances.
aba6b5ed	2014-03-14T21:59:26	Fix leak in git_index_conflict_cleanup I introduced a leak into conflict cleanup by removing items from inside the git_vector_remove_matching call. This simplifies the code to just use one common way for the two conflict cleanup APIs. When an index has an active snapshot, removing an item can cause an error (inserting into the deferred deletion vector), so I made the git_index_conflict_cleanup API return an error code. I felt like this wasn't so bad since it is just like the other APIs. I fixed up a couple of comments while I was changing the header.
cef170ab	2014-03-14T16:45:46	Fix leak when using push and pop with ignores The iterator pushes and pops ignores incrementally onto a list as it traverses the directory structure so that it doesn't have to constantly recheck which ignore files apply. With the new ref counting, it wasn't decrementing the refcount on the ignores that it removed from the vector.
b8777615	2014-03-14T15:37:42	Fix refcount issues with mutex protected ignores Some ignore files were not being freed from the cache.
3816debc	2014-03-14T14:51:04	Fix threading tests when threads disabled
52bb0476	2014-03-14T13:53:15	Clean up index snapshot function naming Clear up some of the various "find" functions and the snapshot API naming to be things I like more.
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.
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.
dac16048	2014-02-08T16:42:26	Add mutex around index entries changes This surrounds any function that mutates the entries vector with a mutex so it can be safely snapshotted.
54edbb98	2014-02-07T16:48:27	Add index snapshot and use it for iterator
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.
3dbee456	2014-02-07T14:10:35	Some index internals refactoring Again, laying groundwork for some index iterator changes, this contains a bunch of code refactorings for index internals that should make it easier down the line to add locking around index modifications. Also this removes the redundant prefix_position function and fixes some potential memory leaks.
c5cacc4e	2014-04-16T19:09:35	Merge pull request #2261 from jacquesg/format-patch Support for format-patch
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
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
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
4d7b9939	2014-04-01T22:18:19	Added cherry-pick support
399f2b62	2014-04-07T20:15:45	Introduce git_merge__extract_conflict_paths
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
7a28f268	2014-04-10T12:44:51	Fix const-correctness of git_patch_get_delta, git_patch_num_hunks, git_patch_num_lines_in_hunk
8e14b47f	2014-04-10T12:42:29	Introduce git__date_rfc2822_fmt. Allows for RFC2822 date headers
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).
b3b36a68	2014-04-10T12:43:16	Introduce git_buf_putcn Allows for inserting the same character n amount of times
bcc62293	2014-04-09T12:45:49	Merge pull request #2259 from libgit2/vmg/state-cleanup Rewrite `state-cleanup`
c3dcbe84	2014-04-09T12:43:27	Rewrite `git_repository__cleanup_files`
361e9192	2014-04-09T12:09:30	Merge pull request #2257 from libgit2/rb/fix-submodules-with-tracked-content Update treatment of submodule-like directories with tracked content in the parent
9ce60fad	2014-04-08T18:40:05	userdiff: update ada patterns This is the moral equivalent of git/git@39a87a29ce364ed3337e535adce5973731ba2968 from Adrian Johnson <ajohnson@redneon.com>.
76b4e3d4	2014-04-08T18:41:39	userdiff: update C/C++ patterns This pulls upstream changes from: git/git@8a2e8da367f7175465118510b474ad365161d6b1 git/git@abf8f9860248d8c213600974742f18dadaa8fbb5 git/git@407e07f2a6f55e605fda9e90cb622887269f68b5 all by Johannes Sixt <j6t@kdbg.org>.
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.
ce2e8269	2014-04-08T16:52:20	graph: handle not finding a merge base gracefully git_merge_base() returns GIT_ENOTFOUND when it cannot find a merge base. graph_desdendant_of() returns a boolean value (barring any errors), so it needs to catch the NOTFOUND return value and convert it into false, as not merge base means it cannot be a descendant.
2795fb4d	2014-04-08T16:37:39	Merge pull request #2256 from jacquesg/graph-descendant Correct grouping of parentheses
56f8e06e	2014-04-08T15:46:45	Correct grouping of parentheses git_graph_descendant_of was returning the result of an assignment
7167fd7e	2014-04-07T11:51:12	vmg is always right
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
6720eef9	2014-04-07T11:22:23	Merge pull request #2249 from libgit2/rb/starstar-fnmatch Add support for ** matches in ignores
c7d96060	2014-04-06T11:20:22	Fix fnmatch comment to be clearer
52056db9	2014-04-06T16:22:29	Merge pull request #2250 from jacquesg/vector-leak Don't lose our elements when calling git_vector_set()
4998009a	2014-04-06T15:06:46	Don't lose our elements when calling git_vector_set()
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
f34408a7	2014-04-04T14:23:07	Merge pull request #2211 from Yogu/retry-renaming-config Retry committing locked files on error
eedeeb9e	2014-04-03T11:58:51	Test (and fix) the git_submodule_sync changes I wrote this stuff a while ago and forgot to write tests. Wanted to do so now to wrap up the PR and immediately found problems.
18cc7d28	2014-04-03T11:29:08	Minor code cleanup
f2fb4bac	2014-04-02T23:55:21	git_submodule_resolve_url supports relative urls The base for the relative urls is determined as follows, with descending priority: - remote url of HEAD's remote tracking branch - remote "origin" - workdir This follows git.git behaviour
3b4ba278	2014-04-03T15:50:21	Const correctness!
67d4997a	2014-04-02T18:44:01	remote: mark branch for-merge even if we're unborn When the current branch is unborn, git will still mark the current branch's upstream for-merge if there is an upstream configuration. The only non-constrived case is cloning from an empty repository which then gains history. origin's master should be marked for-merge. In order to do this, we cannot use the high-level wrappers that expect a reference, as we may not have one. Move over to the internal ones that expect a reference name, which we do have.
64a862c2	2014-04-02T18:48:38	Merge pull request #2237 from mekishizufu/fix_return_value Fix submodule_is_config_only's return value
49653665	2014-04-02T18:21:41	checkout: Fix submodule_is_config_only's return value
fe23860a	2014-04-02T17:45:25	Merge pull request #2230 from anuraggup/revwalk-merge-base No need to find merge base.
ea1ca3c9	2014-04-01T21:30:52	Fix skipping content of contained repos When doing a diff for use in status, we should never show the content of a git repository contained inside another one. The logic to do this was looking for a .git directory and so when a gitlink plain .git file was used, it was failing to exclude the directory content.
8f4e5275	2014-04-01T16:46:25	More tests and fix submodule index refresh There was a little bug where the submodule cache thought that the index date was out of date even when it wasn't that was resulting in some extra scans of index data even when not needed. Mostly this commit adds a bunch of new tests including adding and removing submodules in the index and in the HEAD and seeing if we can automatically pick them up when refreshing.
4ece3e22	2014-04-01T12:19:11	Fix submodule accounting for name and path changes Wrote tests that try adding, removing, and updating the name of submodules which showed a number of problems with how we account for changes when incrementally updating the submodule info. Most of these issues didn't exist before because reloading would always blow away the old submodule data.
f28e4c97	2014-04-01T20:17:49	refspec: git_refspec_parse() does not exist
aa78c9ba	2014-04-01T10:22:51	Minor submodule cache locking improvements This improvement the management of the lock around submodule cache updates slightly, using the lock to make sure that foreach can safely make a snapshot of all existing submodules and making sure that git_submodule_add_setup also grabs a lock before inserting the new submodule. Cache initialization / refresh should already have been holding the lock correctly as it adds submodules.
eeeb9654	2014-03-30T15:35:56	Reinstate efficient submodule reloading This makes it so that git_submodule_reload_all will actually only reload changed items unless the `force` flag is used.
a4ccd2b0	2014-03-29T15:23:01	Use enums instead of bools for submodule options When forcing cache flushes or reload, etc., it is easier to keep track of intent using enums instead of plain bools. Also, this fixes a bug where the cache was not being properly refreshes by a git_submodule_reload_all.
db0e7878	2014-03-28T16:50:49	Make submodule refresh a bit smarter This makes submodule cache refresh actually look at the timestamps from the data sources for submodules and reload as needed if they have changed since the last refresh.
69b6ffc4	2014-03-28T14:02:21	Make a real submodule cache object This takes the old submodule cache which was just a git_strmap and makes a real git_submodule_cache object that can contain other things like a lock and timestamp-ish data to control refreshing of submodule info.
e402d2f1	2014-03-24T11:25:59	Submodule sync refactoring Turns out there was already a helper to do what I wanted to do, so I just made it so that I could use it for sync and switched to that instead.
8286300a	2013-12-18T11:48:57	Fix git_submodule_sync and add new config helper This fixes `git_submodule_sync` to correctly update the remote URL of the default branch of the submodule along with the URL in the parent repository config (i.e. match core Git's behavior). Also move some useful helper logic from the submodule code into a shared config API `git_config__update_entry` that can either set or delete an entry with constraints like not overwriting or not creating a new entry. I used that helper to update a couple other places in the code.
18234b14	2014-02-21T09:14:16	Add efficient git_buf join3 API There are a few places where we need to join three strings to assemble a path. This adds a simple join3 function to avoid the comparatively expensive join_n (which calls strlen on each string twice).
2450d4c6	2014-04-01T09:33:18	Merge pull request #2208 from libgit2/vmg/mempack In-memory packing backend
d67397dd	2014-04-01T09:32:17	Merge pull request #2226 from libgit2/rb/submodule-sorting-fix Fix submodule sort order during iteration
9325460a	2014-04-01T13:47:44	Merge pull request #2206 from libgit2/cmn/inmemory-swap-order Rename in-memory remote to anonymous and swap url and fetch order
fd536d29	2014-03-26T11:15:57	remote: rename inmemory to anonymous and swap url and fetch order The order in this function is the opposite to what create_with_fetchspec() has, so change this one, as url-then-refspec is what git does. As we need to break compilation and the swap doesn't do that, let's take this opportunity to rename in-memory remotes to anonymous as that's really what sets them apart.
3ab57816	2014-03-31T23:23:32	Merge pull request #2178 from libgit2/rb/fix-short-id Fix git_odb_short_id and git_odb_exists_prefix bugs
3bc3d797	2014-03-31T15:15:32	No need to find merge base.
7dcd42a5	2014-03-31T13:31:01	Cleanups
c856f8c5	2014-03-31T12:27:05	Fix submodule sorting in workdir iterator With the changes to how git_path_dirload_with_stat handles things that look like submodules, submodules could end up sorted in the wrong order with the workdir iterator. This moves the submodule check earlier in the iterator processing of a new directory so that the submodule name updates will happen immediately and the sort order will be correct.
945c92a5	2014-03-31T12:26:46	Add faster git_submodule__is_submodule check
7f930ded	2014-03-31T09:38:06	Const up members of git_merge_file_result
336e8957	2014-03-31T19:17:01	Merge pull request #2222 from ethomson/merge_head_id Introduce git_merge_head_id
976634c4	2014-03-30T19:56:18	Introduce git_merge_head_id
31143b36	2014-03-30T18:08:32	Don't reset need_pack While looping over multiple heads, an up-to-date head will clobber the `remote->need_pack` setting, preventing the rest of the machinery from building and downloading a pack-file, breaking fetches.
acdc7cff	2014-03-27T15:29:17	Fix memory leak of submodule branch name

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.

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.

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.

0500a1ef

2014-03-31T08:32:45

config: use a snapshot for the iterator

bd95f836

2014-03-31T08:08:17

config: split out the refresh step This will be used by the writing commands in a later step.

c047317e

2014-03-18T17:54:32

config: make refresh atomic Current code sets the active map to a new one and builds it whilst it's active. This is a race condition with someone else trying to access the same config. Instead, let's build up our new map and swap the active and new one.

29c4cb09

2014-03-15T03:53:36

Use config snapshotting This way we can assume we have a consistent view of the config situation when we're looking up remote, branch, pack-objects, etc.

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.

28fd7206

2014-04-18T12:33:19

Merge pull request #2108 from libgit2/rb/threadsafe-index-iterator Make index iterator thread safe

2bed3553

2014-04-18T00:34:04

cherry-pick: terminate the commit id string We treat this as a NUL-terminated string, so make sure that we add the terminator.

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.

2e9d813b

2014-04-11T12:12:47

Fix tests with new attr cache code

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.

e6e8530a

2014-04-14T12:31:17

Lock attribute file while reparsing data I don't love this approach, but achieving thread-safety for attribute and ignore data while reloading files would require a larger rewrite in order to avoid this. If an attribute or ignore file is out of date, this holds a lock on the file while we are reloading the data so that another thread won't try to reload the data at the same time.

1fa17b5c

2014-03-14T22:01:30

Minor tree cache speedups While I was looking at the conflict cleanup code, I looked over at the tree cache code, since we clear the tree cache for each entry that gets removed and there is some redundancy there. I made some small tweaks to avoid extra calls to strchr and strlen in a few circumstances.

aba6b5ed

2014-03-14T21:59:26

Fix leak in git_index_conflict_cleanup I introduced a leak into conflict cleanup by removing items from inside the git_vector_remove_matching call. This simplifies the code to just use one common way for the two conflict cleanup APIs. When an index has an active snapshot, removing an item can cause an error (inserting into the deferred deletion vector), so I made the git_index_conflict_cleanup API return an error code. I felt like this wasn't so bad since it is just like the other APIs. I fixed up a couple of comments while I was changing the header.

cef170ab

2014-03-14T16:45:46

Fix leak when using push and pop with ignores The iterator pushes and pops ignores incrementally onto a list as it traverses the directory structure so that it doesn't have to constantly recheck which ignore files apply. With the new ref counting, it wasn't decrementing the refcount on the ignores that it removed from the vector.

b8777615

2014-03-14T15:37:42

Fix refcount issues with mutex protected ignores Some ignore files were not being freed from the cache.

3816debc

2014-03-14T14:51:04

Fix threading tests when threads disabled

52bb0476

2014-03-14T13:53:15

Clean up index snapshot function naming Clear up some of the various "find" functions and the snapshot API naming to be things I like more.

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.

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.

dac16048

2014-02-08T16:42:26

Add mutex around index entries changes This surrounds any function that mutates the entries vector with a mutex so it can be safely snapshotted.

54edbb98

2014-02-07T16:48:27

Add index snapshot and use it for iterator

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.

3dbee456

2014-02-07T14:10:35

Some index internals refactoring Again, laying groundwork for some index iterator changes, this contains a bunch of code refactorings for index internals that should make it easier down the line to add locking around index modifications. Also this removes the redundant prefix_position function and fixes some potential memory leaks.

c5cacc4e

2014-04-16T19:09:35

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

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

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

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

4d7b9939

2014-04-01T22:18:19

Added cherry-pick support

399f2b62

2014-04-07T20:15:45

Introduce git_merge__extract_conflict_paths

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

7a28f268

2014-04-10T12:44:51

Fix const-correctness of git_patch_get_delta, git_patch_num_hunks, git_patch_num_lines_in_hunk

8e14b47f

2014-04-10T12:42:29

Introduce git__date_rfc2822_fmt. Allows for RFC2822 date headers

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

b3b36a68

2014-04-10T12:43:16

Introduce git_buf_putcn Allows for inserting the same character n amount of times

bcc62293

2014-04-09T12:45:49

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

c3dcbe84

2014-04-09T12:43:27

Rewrite `git_repository__cleanup_files`

361e9192

2014-04-09T12:09:30

Merge pull request #2257 from libgit2/rb/fix-submodules-with-tracked-content Update treatment of submodule-like directories with tracked content in the parent

9ce60fad

2014-04-08T18:40:05

userdiff: update ada patterns This is the moral equivalent of git/git@39a87a29ce364ed3337e535adce5973731ba2968 from Adrian Johnson <ajohnson@redneon.com>.

76b4e3d4

2014-04-08T18:41:39

userdiff: update C/C++ patterns This pulls upstream changes from: git/git@8a2e8da367f7175465118510b474ad365161d6b1 git/git@abf8f9860248d8c213600974742f18dadaa8fbb5 git/git@407e07f2a6f55e605fda9e90cb622887269f68b5 all by Johannes Sixt <j6t@kdbg.org>.

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.

ce2e8269

2014-04-08T16:52:20

graph: handle not finding a merge base gracefully git_merge_base() returns GIT_ENOTFOUND when it cannot find a merge base. graph_desdendant_of() returns a boolean value (barring any errors), so it needs to catch the NOTFOUND return value and convert it into false, as not merge base means it cannot be a descendant.

2795fb4d

2014-04-08T16:37:39

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

56f8e06e

2014-04-08T15:46:45

Correct grouping of parentheses git_graph_descendant_of was returning the result of an assignment

7167fd7e

2014-04-07T11:51:12

vmg is always right

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

6720eef9

2014-04-07T11:22:23

Merge pull request #2249 from libgit2/rb/starstar-fnmatch Add support for ** matches in ignores

c7d96060

2014-04-06T11:20:22

Fix fnmatch comment to be clearer

52056db9

2014-04-06T16:22:29

Merge pull request #2250 from jacquesg/vector-leak Don't lose our elements when calling git_vector_set()

4998009a

2014-04-06T15:06:46

Don't lose our elements when calling git_vector_set()

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

f34408a7

2014-04-04T14:23:07

Merge pull request #2211 from Yogu/retry-renaming-config Retry committing locked files on error

eedeeb9e

2014-04-03T11:58:51

Test (and fix) the git_submodule_sync changes I wrote this stuff a while ago and forgot to write tests. Wanted to do so now to wrap up the PR and immediately found problems.

18cc7d28

2014-04-03T11:29:08

Minor code cleanup

f2fb4bac

2014-04-02T23:55:21

git_submodule_resolve_url supports relative urls The base for the relative urls is determined as follows, with descending priority: - remote url of HEAD's remote tracking branch - remote "origin" - workdir This follows git.git behaviour

3b4ba278

2014-04-03T15:50:21

Const correctness!

67d4997a

2014-04-02T18:44:01

remote: mark branch for-merge even if we're unborn When the current branch is unborn, git will still mark the current branch's upstream for-merge if there is an upstream configuration. The only non-constrived case is cloning from an empty repository which then gains history. origin's master should be marked for-merge. In order to do this, we cannot use the high-level wrappers that expect a reference, as we may not have one. Move over to the internal ones that expect a reference name, which we do have.

64a862c2

2014-04-02T18:48:38

Merge pull request #2237 from mekishizufu/fix_return_value Fix submodule_is_config_only's return value

49653665

2014-04-02T18:21:41

checkout: Fix submodule_is_config_only's return value

fe23860a

2014-04-02T17:45:25

Merge pull request #2230 from anuraggup/revwalk-merge-base No need to find merge base.

ea1ca3c9

2014-04-01T21:30:52

Fix skipping content of contained repos When doing a diff for use in status, we should never show the content of a git repository contained inside another one. The logic to do this was looking for a .git directory and so when a gitlink plain .git file was used, it was failing to exclude the directory content.

8f4e5275

2014-04-01T16:46:25

More tests and fix submodule index refresh There was a little bug where the submodule cache thought that the index date was out of date even when it wasn't that was resulting in some extra scans of index data even when not needed. Mostly this commit adds a bunch of new tests including adding and removing submodules in the index and in the HEAD and seeing if we can automatically pick them up when refreshing.

4ece3e22

2014-04-01T12:19:11

Fix submodule accounting for name and path changes Wrote tests that try adding, removing, and updating the name of submodules which showed a number of problems with how we account for changes when incrementally updating the submodule info. Most of these issues didn't exist before because reloading would always blow away the old submodule data.

f28e4c97

2014-04-01T20:17:49

refspec: git_refspec_parse() does not exist

aa78c9ba

2014-04-01T10:22:51

Minor submodule cache locking improvements This improvement the management of the lock around submodule cache updates slightly, using the lock to make sure that foreach can safely make a snapshot of all existing submodules and making sure that git_submodule_add_setup also grabs a lock before inserting the new submodule. Cache initialization / refresh should already have been holding the lock correctly as it adds submodules.

eeeb9654

2014-03-30T15:35:56

Reinstate efficient submodule reloading This makes it so that git_submodule_reload_all will actually only reload changed items unless the `force` flag is used.

a4ccd2b0

2014-03-29T15:23:01

Use enums instead of bools for submodule options When forcing cache flushes or reload, etc., it is easier to keep track of intent using enums instead of plain bools. Also, this fixes a bug where the cache was not being properly refreshes by a git_submodule_reload_all.

db0e7878

2014-03-28T16:50:49

Make submodule refresh a bit smarter This makes submodule cache refresh actually look at the timestamps from the data sources for submodules and reload as needed if they have changed since the last refresh.

69b6ffc4

2014-03-28T14:02:21

Make a real submodule cache object This takes the old submodule cache which was just a git_strmap and makes a real git_submodule_cache object that can contain other things like a lock and timestamp-ish data to control refreshing of submodule info.

e402d2f1

2014-03-24T11:25:59

Submodule sync refactoring Turns out there was already a helper to do what I wanted to do, so I just made it so that I could use it for sync and switched to that instead.

8286300a

2013-12-18T11:48:57

Fix git_submodule_sync and add new config helper This fixes `git_submodule_sync` to correctly update the remote URL of the default branch of the submodule along with the URL in the parent repository config (i.e. match core Git's behavior). Also move some useful helper logic from the submodule code into a shared config API `git_config__update_entry` that can either set or delete an entry with constraints like not overwriting or not creating a new entry. I used that helper to update a couple other places in the code.

18234b14

2014-02-21T09:14:16

Add efficient git_buf join3 API There are a few places where we need to join three strings to assemble a path. This adds a simple join3 function to avoid the comparatively expensive join_n (which calls strlen on each string twice).

2450d4c6

2014-04-01T09:33:18

Merge pull request #2208 from libgit2/vmg/mempack In-memory packing backend

d67397dd

2014-04-01T09:32:17

Merge pull request #2226 from libgit2/rb/submodule-sorting-fix Fix submodule sort order during iteration

9325460a

2014-04-01T13:47:44

Merge pull request #2206 from libgit2/cmn/inmemory-swap-order Rename in-memory remote to anonymous and swap url and fetch order

fd536d29

2014-03-26T11:15:57

remote: rename inmemory to anonymous and swap url and fetch order The order in this function is the opposite to what create_with_fetchspec() has, so change this one, as url-then-refspec is what git does. As we need to break compilation and the swap doesn't do that, let's take this opportunity to rename in-memory remotes to anonymous as that's really what sets them apart.

3ab57816

2014-03-31T23:23:32

Merge pull request #2178 from libgit2/rb/fix-short-id Fix git_odb_short_id and git_odb_exists_prefix bugs

3bc3d797

2014-03-31T15:15:32

No need to find merge base.

7dcd42a5

2014-03-31T13:31:01

Cleanups

c856f8c5

2014-03-31T12:27:05

Fix submodule sorting in workdir iterator With the changes to how git_path_dirload_with_stat handles things that look like submodules, submodules could end up sorted in the wrong order with the workdir iterator. This moves the submodule check earlier in the iterator processing of a new directory so that the submodule name updates will happen immediately and the sort order will be correct.

945c92a5

2014-03-31T12:26:46

Add faster git_submodule__is_submodule check

7f930ded

2014-03-31T09:38:06

Const up members of git_merge_file_result

336e8957

2014-03-31T19:17:01

Merge pull request #2222 from ethomson/merge_head_id Introduce git_merge_head_id

976634c4

2014-03-30T19:56:18

Introduce git_merge_head_id

31143b36

2014-03-30T18:08:32

Don't reset need_pack While looping over multiple heads, an up-to-date head will clobber the `remote->need_pack` setting, preventing the rest of the machinery from building and downloading a pack-file, breaking fetches.

acdc7cff

2014-03-27T15:29:17

Fix memory leak of submodule branch name

thodg/libgit2/src

src

Log