kmx git

Commit	Date	Message
85ef6ec5	2016-05-12T13:18:07	Ignore submodules when checking for merge conflicts in the workdir.
3679ebae	2016-02-11T23:37:52	Horrible fix for #3173.
fac42ff9	2016-02-08T16:58:08	merge: fix memory leak
879ebab3	2015-12-16T12:30:52	merge: Use `git_index__fill` to populate the index Instead of calling `git_index_add` in a loop, use the new `git_index_fill` internal API to fill the index with the initial staged entries. The new `fill` helper assumes that all the entries will be unique and valid, so it can append them at the end of the entries vector and only sort it once at the end. It performs no validation checks. This prevents the quadratic behavior caused by having to sort the entries list once after every insertion.
5b9c63c3	2015-11-20T19:01:42	recursive merge: add a recursion limit
78859c63	2015-11-20T17:33:49	merge: handle conflicts in recursive base building When building a recursive merge base, allow conflicts to occur. Use the file (with conflict markers) as the common ancestor. The user has already seen and dealt with this conflict by virtue of having a criss-cross merge. If they resolved this conflict identically in both branches, then there will be no conflict in the result. This is the best case scenario. If they did not resolve the conflict identically in the two branches, then we will generate a new conflict. If the user is simply using standard conflict output then the results will be fairly sensible. But if the user is using a mergetool or using diff3 output, then the common ancestor will be a conflict file (itself with diff3 output, haha!). This is quite terrible, but it matches git's behavior.
76ade3a0	2015-11-10T21:21:26	merge: use annotated commits for recursion Use annotated commits to act as our virtual bases, instead of regular commits, to avoid polluting the odb with virtual base commits and trees. Instead, build an annotated commit with an index and pointers to the commits that it was merged from.
7730fe8e	2015-11-09T13:01:48	merge: merge annotated commits instead of regular commits
3f2bb387	2015-10-28T11:00:55	merge: octopus merge common ancestors when >2 When there are more than two common ancestors, continue merging the virtual base with the additional common ancestors, effectively octopus merging a new virtual base.
1b82f7b6	2015-10-27T14:24:51	merge: compute octopus merge bases
75dee59c	2015-10-26T10:37:58	merge: build virtual base of multiple merge bases When the commits to merge have multiple common ancestors, build a "virtual" base tree by merging the common ancestors.
fa78782f	2015-10-22T17:00:09	merge: rename `git_merge_tree_flags_t` -> `git_merge_flags_t`
1d0bed9d	2015-10-30T14:02:01	merge-base: Style
4cacf5b5	2015-10-30T11:50:43	merge-base: Do not read parents from the root
136a71f4	2015-10-30T11:45:52	merge-base: Remove redundant merge bases
d845abe6	2015-10-28T14:49:28	merge: Do not mallocz unecessary entries
d3416dfe	2015-10-28T10:50:25	pool: Dot not assume mallocs are zeroed out
1e5e02b4	2015-10-27T17:26:04	pool: Simplify implementation
7a02e93e	2015-10-27T22:42:40	merge: Plug memory leak
a1f5d691	2015-10-27T22:42:15	merge: Implement `GIT_MERGE_TREE_SKIP_REUC`
8683d31f	2015-10-22T14:39:20	merge: add GIT_MERGE_TREE_FAIL_ON_CONFLICT Provide a new merge option, GIT_MERGE_TREE_FAIL_ON_CONFLICT, which will stop on the first conflict and fail the merge operation with GIT_EMERGECONFLICT.
6c014bcc	2015-09-29T12:18:17	diff: don't feed large files to xdiff
e4352066	2015-09-28T18:25:24	merge_file: treat large files as binary xdiff craps the bed on large files. Treat very large files as binary, so that it doesn't even have to try. Refactor our merge binary handling to better match git.git, which looks for a NUL in the first 8000 bytes.
56ed415a	2015-08-30T19:10:00	diff: drop `FILELIST_MATCH` Now that non-pathspec matching diffs are implemented at the iterator level, drop `FILELIST_MATCH`ing.
4a0dbeb0	2015-08-30T17:06:26	diff: use new iterator pathlist handling When using literal pathspecs in diff with `GIT_DIFF_DISABLE_PATHSPEC_MATCH` turn on the faster iterator pathlist handling. Updates iterator pathspecs to include directory prefixes (eg, `foo/`) for compatibility with `GIT_DIFF_DISABLE_PATHSPEC_MATCH`.
ef206124	2015-07-28T19:55:37	Move filelist into the iterator handling itself.
ed1c6446	2015-07-28T11:41:27	iterator: use an options struct instead of args
768f8be3	2015-06-30T19:00:41	Fix #3094 - improve use of portable size_t/ssize_t format specifiers. The header src/cc-compat.h defines portable format specifiers PRIuZ, PRIdZ, and PRIxZ. The original report highlighted the need to use these specifiers in examples/network/fetch.c. For this commit, I checked all C source and header files not in deps/ and transitioned to the appropriate format specifier where appropriate.
8960dc1e	2015-06-24T18:10:30	iterator: provide git_iterator_walk Provide `git_iterator_walk` to walk each iterator in lockstep, returning each iterator's idea of the contents of the next path.
ca2857d8	2015-06-10T10:30:08	merge: actually increment the counts, not the pointers `merge_diff_list_count_candidates()` takes pointers to the source and target counts, but when it comes time to increase them, we're increasing the pointer, rather than the value it's pointing to. Dereference the value to increase.
885b94aa	2015-05-28T15:26:13	Rename GIT_EMERGECONFLICT to GIT_ECONFLICT We do not error on "merge conflicts"; on the contrary, merge conflicts are a normal part of merging. We only error on "checkout conflicts", where a change exists in the index or the working directory that would otherwise be overwritten by performing the checkout. This may happen during merge (after the production of the new index that we're going to checkout) but it could happen during any checkout.
9f545b9d	2015-05-19T11:23:59	introduce `git_index_entry_is_conflict` It's not always obvious the mapping between stage level and conflict-ness. More importantly, this can lead otherwise sane people to write constructs like `if (!git_index_entry_stage(entry))`, which (while technically correct) is unreadable. Provide a nice method to help avoid such messy thinking.
9ebb5a3f	2015-02-18T22:53:40	merge: merge iterators
89ba9f1a	2015-03-18T13:17:04	Merge pull request #2967 from jacquesg/merge-whitespace Allow merges of files (and trees) with whitespace problems/fixes
fea24c53	2015-03-16T15:54:53	PERF: In MERGE, lazily compute is_binary
13de9363	2015-03-12T12:36:09	Collapse whitespace flags into git_merge_file_flags_t
f29dde68	2015-03-12T12:29:47	Renamed git_merge_options 'flags' to 'tree_flags'
45a86bbf	2015-03-09T17:02:52	Allow for merges with whitespace discrepancies
a291790a	2015-02-15T05:18:01	Merge pull request #2831 from ethomson/merge_lock merge: lock index during the merge (not just checkout)
41fae48d	2015-02-03T22:31:10	indexwriter: an indexwriter for repo operations Provide git_indexwriter_init_for_operation for the common locking pattern in merge, rebase, revert and cherry-pick.
8b0ddd5d	2015-01-17T23:28:53	merge: lock the index at the start of the merge Always lock the index when we begin the merge, before we write any of the metdata files. This prevents a race where another client may run a commit after we have written the MERGE_HEAD but before we have updated the index, which will produce a merge commit that is treesame to one parent. The merge will finish and update the index and the resultant commit would not be a merge at all.
f1453c59	2015-02-12T12:19:37	Make our overflow check look more like gcc/clang's Make our overflow checking look more like gcc and clang's, so that we can substitute it out with the compiler instrinsics on platforms that support it. This means dropping the ability to pass `NULL` as an out parameter. As a result, the macros also get updated to reflect this as well.
392702ee	2015-02-09T23:41:13	allocations: test for overflow of requested size Introduce some helper macros to test integer overflow from arithmetic and set error message appropriately.
85880693	2015-01-14T10:19:28	Merge branch 'pr/2740'
b3837d4d	2014-12-02T05:47:32	Always use GIT_HASHSIG_SMART_WHITESPACE when diffing for merges git_merge_tree_flag_t cannot contain any GIT_DIFF_FIND_xxx flags so there's not point in checking for them
6f73e026	2014-12-24T11:42:50	Plug some leaks
18b00406	2014-10-03T19:02:29	s/git_merge_head/git_annotated_commit Rename git_merge_head to git_annotated_commit, as it becomes used in more operations than just merge.
867a36f3	2014-07-14T14:35:01	Introduce git_rebase to set up a rebase session Introduce `git_rebase` to set up a rebase session that can then be continued. Immediately, only merge-type rebase is supported.
917f85a1	2014-10-09T14:16:10	Extract shared functionality.
eca07bcd	2014-10-09T13:58:23	Add git_merge_bases_many.
737b5051	2014-10-01T12:03:24	hashsig: Export as a `sys` header
dc68ee8d	2014-09-12T22:37:15	Remove local unused index_repo variable
a565f364	2014-09-12T22:53:56	Only check for workdir conflicts if the index has merged files Passing 0 as the length of the paths to check to git_diff_index_to_workdir results in all files being treated as conflicting, that is, all untracked or modified files in the worktree is reported as conflicting
46a13f32	2014-08-29T18:19:56	Merge pull request #2481 from libgit2/cmn/oidarray merge: expose multiple merge bases
017c0eac	2014-08-25T22:41:07	merge base: Correctly raise an error if a non-commit object is passed.
7db0e6ee	2014-07-18T16:00:21	merge: expose multiple merge bases We always calculate multiple merge bases, but up to now we had only exposed the "best" merge base. Introduce git_oidarray which analogously to git_strarray lets us return multiple ids.
994404b5	2014-07-17T01:25:31	Don't allow conflicts by default
02bf955f	2014-07-02T15:42:15	merge: don't open COMMIT_MSG unless we need to append conflicts
967f5a76	2014-05-23T14:50:51	git_checkout_index: checkout other indexes git_checkout_index can now check out other git_index's (that are not necessarily the repository index). This allows checkout_index to use the repository's index for stat cache information instead of the index data being checked out. git_merge and friends now check out their indexes directly instead of trying to blend it into the running index.
eff531e1	2014-05-27T20:58:20	Modify GIT_MERGE_CONFIG -> GIT_MERGE_PREFERENCE
de3f851e	2014-05-21T09:44:05	Staticify `merge_config`
22ab8881	2014-05-20T22:07:15	Use a config snapshot
a3622ba6	2014-05-16T13:54:40	Move GIT_MERGE_CONFIG_* to its own enum
d362093f	2014-05-08T15:41:36	Introduce GIT_MERGE_CONFIG_* for merge.ff settings git_merge_analysis will now return GIT_MERGE_CONFIG_NO_FASTFORWARD when merge.ff=false and GIT_MERGE_CONFIG_FASTFORWARD_ONLY when merge.ff=true
702efc89	2014-04-30T10:57:42	Make init_options fns use unsigned ints and macro Use an unsigned int for the version and add a helper macro so the code is simplified (and so the error message is a common string).
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
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.
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.
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.
6fefb7af	2014-04-13T19:53:35	Capture conflict information in MERGE_MSG for revert and merge
399f2b62	2014-04-07T20:15:45	Introduce git_merge__extract_conflict_paths
3b4ba278	2014-04-03T15:50:21	Const correctness!
976634c4	2014-03-30T19:56:18	Introduce git_merge_head_id
9cb99e8b	2014-03-26T12:43:41	Free temporary merge index
85a41fc4	2014-03-24T18:09:13	Merge pull request #2183 from ethomson/merge_refactor Refactor the `git_merge` API
704b55cc	2014-03-20T20:24:11	revwalk: don't try to find merge bases when there can be none As a way to speed up the cases where we need to hide some commits, we find out what the merge bases are so we know to stop marking commits as uninteresting and avoid walking down a potentially very large amount of commits which we will never see. There are however two oversights in current code. The merge-base finding algorithm fails to recognize that if it is only given one commit, there can be no merge base. It instead walks down the whole ancestor chain needlessly. Make it return an empty list immediately in this situation. The revwalk does not know whether the user has asked to hide any commits at all. In situation where the user pushes multiple commits but doesn't hide any, the above fix wouldn't do the trick. Keep track of whether the user wants to hide any commits and only run the merge-base finding algorithm when it's needed.
58c2b1c4	2014-03-20T09:35:22	UNBORN implies FAST_FORWARD
ac584fcf	2014-03-18T16:04:51	Introduce GIT_MERGE_ANALYSIS_UNBORN
97f3462a	2014-03-18T13:14:09	git_merge_status -> git_merge_analysis
d9fdee6e	2014-03-12T09:43:53	Remove `git_merge_result` as it's now unnecessary
5aa2ac6d	2014-03-11T22:47:39	Update git_merge_tree_opts to git_merge_options
02105a27	2014-03-11T18:40:38	Change signature of `git_merge` to take merge and checkout opts
1c0b6a38	2014-03-11T17:58:10	Remove fastforward / uptodate from `git_merge`
ccb30827	2014-03-11T17:19:35	Add `git_merge_status` to provide info about an upcoming merge
05d47768	2014-03-10T22:30:41	Introduce git_merge_file for consumers
0aee025b	2014-03-18T22:31:14	Implement git_merge_base_octopus
b9f81997	2014-03-05T21:49:23	Added function-based initializers for every options struct. The basic structure of each function is courtesy of arrbee.
72556cc6	2014-02-20T14:27:10	Address PR comments * Make GIT_INLINE an internal definition so it cannot be used in public headers * Fix language in CONTRIBUTING * Make index caps API use signed instead of unsigned values
c4ee3b54	2014-02-07T18:32:06	Merge pull request #2100 from libgit2/rb/update-pqueue Replace priority queue code with implementation from hashsig
4075e060	2014-02-03T21:02:08	Replace pqueue with code from hashsig heap I accidentally wrote a separate priority queue implementation when I was working on file rename detection as part of the file hash signature calculation code. To simplify licensing terms, I just adapted that to a general purpose priority queue and replace the old priority queue implementation that was borrowed from elsewhere. This also removes parts of the COPYING document that no longer apply to libgit2.
dbfd83bc	2014-02-03T19:56:13	Remove unused pointer assignment
c0b10c25	2014-02-01T12:05:00	Merge wd validation tests against index not HEAD Validating the workdir should not compare HEAD to working directory - this is both inefficient (as it ignores the cache) and incorrect. If we had legitimately allowed changes in the index (identical to the merge result) then comparing HEAD to workdir would reject these changes as different. Further, this will identify files that were filtered strangely as modified, while testing with the cache would prevent this. Also, it's stupid slow.
0972c592	2014-01-29T13:14:00	Two-phase index merging When three-way merging indexes, we previously changed each path as we read them, which would lead to us adding an index entry for 'foo', then removing an index entry for 'foo/file'. With the new index requirements, this is not allowed. Removing entries in the merged index, then adding them, resolves this. In the previous example, we now remove 'foo/file' before adding 'foo'.
a1bbc0ce	2014-01-25T04:14:37	merge: rename _oid() -> id() Following the rest of the series, use 'id' when refering to the value.
9950bb4e	2014-01-24T20:23:17	diff: rename the file's 'oid' to 'id' In the same vein as the previous commits in this series.
d541170c	2014-01-24T11:36:41	index: rename an entry's id to 'id' This was not converted when we converted the rest, so do it now.
0ef19fe1	2014-01-20T17:13:55	Merge submodules
0e1ba46c	2014-01-19T20:03:13	Remove the "merge none" flag The "merge none" (don't automerge) flag was only to aide in merge trivial tests. We can easily determine whether merge trivial resulted in a trivial merge or an automerge by examining the REUC after automerge has completed.
e651e8e2	2014-01-19T15:05:08	Introduce diff3 mode for checking out conflicts

85ef6ec5

2016-05-12T13:18:07

Ignore submodules when checking for merge conflicts in the workdir.

3679ebae

2016-02-11T23:37:52

Horrible fix for #3173.

fac42ff9

2016-02-08T16:58:08

merge: fix memory leak

879ebab3

2015-12-16T12:30:52

merge: Use `git_index__fill` to populate the index Instead of calling `git_index_add` in a loop, use the new `git_index_fill` internal API to fill the index with the initial staged entries. The new `fill` helper assumes that all the entries will be unique and valid, so it can append them at the end of the entries vector and only sort it once at the end. It performs no validation checks. This prevents the quadratic behavior caused by having to sort the entries list once after every insertion.

5b9c63c3

2015-11-20T19:01:42

recursive merge: add a recursion limit

78859c63

2015-11-20T17:33:49

merge: handle conflicts in recursive base building When building a recursive merge base, allow conflicts to occur. Use the file (with conflict markers) as the common ancestor. The user has already seen and dealt with this conflict by virtue of having a criss-cross merge. If they resolved this conflict identically in both branches, then there will be no conflict in the result. This is the best case scenario. If they did not resolve the conflict identically in the two branches, then we will generate a new conflict. If the user is simply using standard conflict output then the results will be fairly sensible. But if the user is using a mergetool or using diff3 output, then the common ancestor will be a conflict file (itself with diff3 output, haha!). This is quite terrible, but it matches git's behavior.

76ade3a0

2015-11-10T21:21:26

merge: use annotated commits for recursion Use annotated commits to act as our virtual bases, instead of regular commits, to avoid polluting the odb with virtual base commits and trees. Instead, build an annotated commit with an index and pointers to the commits that it was merged from.

7730fe8e

2015-11-09T13:01:48

merge: merge annotated commits instead of regular commits

3f2bb387

2015-10-28T11:00:55

merge: octopus merge common ancestors when >2 When there are more than two common ancestors, continue merging the virtual base with the additional common ancestors, effectively octopus merging a new virtual base.

1b82f7b6

2015-10-27T14:24:51

merge: compute octopus merge bases

75dee59c

2015-10-26T10:37:58

merge: build virtual base of multiple merge bases When the commits to merge have multiple common ancestors, build a "virtual" base tree by merging the common ancestors.

fa78782f

2015-10-22T17:00:09

merge: rename `git_merge_tree_flags_t` -> `git_merge_flags_t`

1d0bed9d

2015-10-30T14:02:01

merge-base: Style

4cacf5b5

2015-10-30T11:50:43

merge-base: Do not read parents from the root

136a71f4

2015-10-30T11:45:52

merge-base: Remove redundant merge bases

d845abe6

2015-10-28T14:49:28

merge: Do not mallocz unecessary entries

d3416dfe

2015-10-28T10:50:25

pool: Dot not assume mallocs are zeroed out

1e5e02b4

2015-10-27T17:26:04

pool: Simplify implementation

7a02e93e

2015-10-27T22:42:40

merge: Plug memory leak

a1f5d691

2015-10-27T22:42:15

merge: Implement `GIT_MERGE_TREE_SKIP_REUC`

8683d31f

2015-10-22T14:39:20

merge: add GIT_MERGE_TREE_FAIL_ON_CONFLICT Provide a new merge option, GIT_MERGE_TREE_FAIL_ON_CONFLICT, which will stop on the first conflict and fail the merge operation with GIT_EMERGECONFLICT.

6c014bcc

2015-09-29T12:18:17

diff: don't feed large files to xdiff

e4352066

2015-09-28T18:25:24

merge_file: treat large files as binary xdiff craps the bed on large files. Treat very large files as binary, so that it doesn't even have to try. Refactor our merge binary handling to better match git.git, which looks for a NUL in the first 8000 bytes.

56ed415a

2015-08-30T19:10:00

diff: drop `FILELIST_MATCH` Now that non-pathspec matching diffs are implemented at the iterator level, drop `FILELIST_MATCH`ing.

4a0dbeb0

2015-08-30T17:06:26

diff: use new iterator pathlist handling When using literal pathspecs in diff with `GIT_DIFF_DISABLE_PATHSPEC_MATCH` turn on the faster iterator pathlist handling. Updates iterator pathspecs to include directory prefixes (eg, `foo/`) for compatibility with `GIT_DIFF_DISABLE_PATHSPEC_MATCH`.

ef206124

2015-07-28T19:55:37

Move filelist into the iterator handling itself.

ed1c6446

2015-07-28T11:41:27

iterator: use an options struct instead of args

768f8be3

2015-06-30T19:00:41

Fix #3094 - improve use of portable size_t/ssize_t format specifiers. The header src/cc-compat.h defines portable format specifiers PRIuZ, PRIdZ, and PRIxZ. The original report highlighted the need to use these specifiers in examples/network/fetch.c. For this commit, I checked all C source and header files not in deps/ and transitioned to the appropriate format specifier where appropriate.

8960dc1e

2015-06-24T18:10:30

iterator: provide git_iterator_walk Provide `git_iterator_walk` to walk each iterator in lockstep, returning each iterator's idea of the contents of the next path.

ca2857d8

2015-06-10T10:30:08

merge: actually increment the counts, not the pointers `merge_diff_list_count_candidates()` takes pointers to the source and target counts, but when it comes time to increase them, we're increasing the pointer, rather than the value it's pointing to. Dereference the value to increase.

885b94aa

2015-05-28T15:26:13

Rename GIT_EMERGECONFLICT to GIT_ECONFLICT We do not error on "merge conflicts"; on the contrary, merge conflicts are a normal part of merging. We only error on "checkout conflicts", where a change exists in the index or the working directory that would otherwise be overwritten by performing the checkout. This *may* happen during merge (after the production of the new index that we're going to checkout) but it could happen during any checkout.

9f545b9d

2015-05-19T11:23:59

introduce `git_index_entry_is_conflict` It's not always obvious the mapping between stage level and conflict-ness. More importantly, this can lead otherwise sane people to write constructs like `if (!git_index_entry_stage(entry))`, which (while technically correct) is unreadable. Provide a nice method to help avoid such messy thinking.

9ebb5a3f

2015-02-18T22:53:40

merge: merge iterators

89ba9f1a

2015-03-18T13:17:04

Merge pull request #2967 from jacquesg/merge-whitespace Allow merges of files (and trees) with whitespace problems/fixes

fea24c53

2015-03-16T15:54:53

PERF: In MERGE, lazily compute is_binary

13de9363

2015-03-12T12:36:09

Collapse whitespace flags into git_merge_file_flags_t

f29dde68

2015-03-12T12:29:47

Renamed git_merge_options 'flags' to 'tree_flags'

45a86bbf

2015-03-09T17:02:52

Allow for merges with whitespace discrepancies

a291790a

2015-02-15T05:18:01

Merge pull request #2831 from ethomson/merge_lock merge: lock index during the merge (not just checkout)

41fae48d

2015-02-03T22:31:10

indexwriter: an indexwriter for repo operations Provide git_indexwriter_init_for_operation for the common locking pattern in merge, rebase, revert and cherry-pick.

8b0ddd5d

2015-01-17T23:28:53

merge: lock the index at the start of the merge Always lock the index when we begin the merge, before we write any of the metdata files. This prevents a race where another client may run a commit after we have written the MERGE_HEAD but before we have updated the index, which will produce a merge commit that is treesame to one parent. The merge will finish and update the index and the resultant commit would not be a merge at all.

f1453c59

2015-02-12T12:19:37

Make our overflow check look more like gcc/clang's Make our overflow checking look more like gcc and clang's, so that we can substitute it out with the compiler instrinsics on platforms that support it. This means dropping the ability to pass `NULL` as an out parameter. As a result, the macros also get updated to reflect this as well.

392702ee

2015-02-09T23:41:13

allocations: test for overflow of requested size Introduce some helper macros to test integer overflow from arithmetic and set error message appropriately.

85880693

2015-01-14T10:19:28

Merge branch 'pr/2740'

b3837d4d

2014-12-02T05:47:32

Always use GIT_HASHSIG_SMART_WHITESPACE when diffing for merges git_merge_tree_flag_t cannot contain any GIT_DIFF_FIND_xxx flags so there's not point in checking for them

6f73e026

2014-12-24T11:42:50

Plug some leaks

18b00406

2014-10-03T19:02:29

s/git_merge_head/git_annotated_commit Rename git_merge_head to git_annotated_commit, as it becomes used in more operations than just merge.

867a36f3

2014-07-14T14:35:01

Introduce git_rebase to set up a rebase session Introduce `git_rebase` to set up a rebase session that can then be continued. Immediately, only merge-type rebase is supported.

917f85a1

2014-10-09T14:16:10

Extract shared functionality.

eca07bcd

2014-10-09T13:58:23

Add git_merge_bases_many.

737b5051

2014-10-01T12:03:24

hashsig: Export as a `sys` header

dc68ee8d

2014-09-12T22:37:15

Remove local unused index_repo variable

a565f364

2014-09-12T22:53:56

Only check for workdir conflicts if the index has merged files Passing 0 as the length of the paths to check to git_diff_index_to_workdir results in all files being treated as conflicting, that is, all untracked or modified files in the worktree is reported as conflicting

46a13f32

2014-08-29T18:19:56

Merge pull request #2481 from libgit2/cmn/oidarray merge: expose multiple merge bases

017c0eac

2014-08-25T22:41:07

merge base: Correctly raise an error if a non-commit object is passed.

7db0e6ee

2014-07-18T16:00:21

merge: expose multiple merge bases We always calculate multiple merge bases, but up to now we had only exposed the "best" merge base. Introduce git_oidarray which analogously to git_strarray lets us return multiple ids.

994404b5

2014-07-17T01:25:31

Don't allow conflicts by default

02bf955f

2014-07-02T15:42:15

merge: don't open COMMIT_MSG unless we need to append conflicts

967f5a76

2014-05-23T14:50:51

git_checkout_index: checkout other indexes git_checkout_index can now check out other git_index's (that are not necessarily the repository index). This allows checkout_index to use the repository's index for stat cache information instead of the index data being checked out. git_merge and friends now check out their indexes directly instead of trying to blend it into the running index.

eff531e1

2014-05-27T20:58:20

Modify GIT_MERGE_CONFIG -> GIT_MERGE_PREFERENCE

de3f851e

2014-05-21T09:44:05

Staticify `merge_config`

22ab8881

2014-05-20T22:07:15

Use a config snapshot

a3622ba6

2014-05-16T13:54:40

Move GIT_MERGE_CONFIG_* to its own enum

d362093f

2014-05-08T15:41:36

Introduce GIT_MERGE_CONFIG_* for merge.ff settings git_merge_analysis will now return GIT_MERGE_CONFIG_NO_FASTFORWARD when merge.ff=false and GIT_MERGE_CONFIG_FASTFORWARD_ONLY when merge.ff=true

702efc89

2014-04-30T10:57:42

Make init_options fns use unsigned ints and macro Use an unsigned int for the version and add a helper macro so the code is simplified (and so the error message is a common string).

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

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.

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.

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.

6fefb7af

2014-04-13T19:53:35

Capture conflict information in MERGE_MSG for revert and merge

399f2b62

2014-04-07T20:15:45

Introduce git_merge__extract_conflict_paths

3b4ba278

2014-04-03T15:50:21

Const correctness!

976634c4

2014-03-30T19:56:18

Introduce git_merge_head_id

9cb99e8b

2014-03-26T12:43:41

Free temporary merge index

85a41fc4

2014-03-24T18:09:13

Merge pull request #2183 from ethomson/merge_refactor Refactor the `git_merge` API

704b55cc

2014-03-20T20:24:11

revwalk: don't try to find merge bases when there can be none As a way to speed up the cases where we need to hide some commits, we find out what the merge bases are so we know to stop marking commits as uninteresting and avoid walking down a potentially very large amount of commits which we will never see. There are however two oversights in current code. The merge-base finding algorithm fails to recognize that if it is only given one commit, there can be no merge base. It instead walks down the whole ancestor chain needlessly. Make it return an empty list immediately in this situation. The revwalk does not know whether the user has asked to hide any commits at all. In situation where the user pushes multiple commits but doesn't hide any, the above fix wouldn't do the trick. Keep track of whether the user wants to hide any commits and only run the merge-base finding algorithm when it's needed.

58c2b1c4

2014-03-20T09:35:22

UNBORN implies FAST_FORWARD

ac584fcf

2014-03-18T16:04:51

Introduce GIT_MERGE_ANALYSIS_UNBORN

97f3462a

2014-03-18T13:14:09

git_merge_status -> git_merge_analysis

d9fdee6e

2014-03-12T09:43:53

Remove `git_merge_result` as it's now unnecessary

5aa2ac6d

2014-03-11T22:47:39

Update git_merge_tree_opts to git_merge_options

02105a27

2014-03-11T18:40:38

Change signature of `git_merge` to take merge and checkout opts

1c0b6a38

2014-03-11T17:58:10

Remove fastforward / uptodate from `git_merge`

ccb30827

2014-03-11T17:19:35

Add `git_merge_status` to provide info about an upcoming merge

05d47768

2014-03-10T22:30:41

Introduce git_merge_file for consumers

0aee025b

2014-03-18T22:31:14

Implement git_merge_base_octopus

b9f81997

2014-03-05T21:49:23

Added function-based initializers for every options struct. The basic structure of each function is courtesy of arrbee.

72556cc6

2014-02-20T14:27:10

Address PR comments * Make GIT_INLINE an internal definition so it cannot be used in public headers * Fix language in CONTRIBUTING * Make index caps API use signed instead of unsigned values

c4ee3b54

2014-02-07T18:32:06

Merge pull request #2100 from libgit2/rb/update-pqueue Replace priority queue code with implementation from hashsig

4075e060

2014-02-03T21:02:08

Replace pqueue with code from hashsig heap I accidentally wrote a separate priority queue implementation when I was working on file rename detection as part of the file hash signature calculation code. To simplify licensing terms, I just adapted that to a general purpose priority queue and replace the old priority queue implementation that was borrowed from elsewhere. This also removes parts of the COPYING document that no longer apply to libgit2.

dbfd83bc

2014-02-03T19:56:13

Remove unused pointer assignment

c0b10c25

2014-02-01T12:05:00

Merge wd validation tests against index not HEAD Validating the workdir should not compare HEAD to working directory - this is both inefficient (as it ignores the cache) and incorrect. If we had legitimately allowed changes in the index (identical to the merge result) then comparing HEAD to workdir would reject these changes as different. Further, this will identify files that were filtered strangely as modified, while testing with the cache would prevent this. Also, it's stupid slow.

0972c592

2014-01-29T13:14:00

Two-phase index merging When three-way merging indexes, we previously changed each path as we read them, which would lead to us adding an index entry for 'foo', then removing an index entry for 'foo/file'. With the new index requirements, this is not allowed. Removing entries in the merged index, then adding them, resolves this. In the previous example, we now remove 'foo/file' before adding 'foo'.

a1bbc0ce

2014-01-25T04:14:37

merge: rename _oid() -> id() Following the rest of the series, use 'id' when refering to the value.

9950bb4e

2014-01-24T20:23:17

diff: rename the file's 'oid' to 'id' In the same vein as the previous commits in this series.

d541170c

2014-01-24T11:36:41

index: rename an entry's id to 'id' This was not converted when we converted the rest, so do it now.

0ef19fe1

2014-01-20T17:13:55

Merge submodules

0e1ba46c

2014-01-19T20:03:13

Remove the "merge none" flag The "merge none" (don't automerge) flag was only to aide in merge trivial tests. We can easily determine whether merge trivial resulted in a trivial merge or an automerge by examining the REUC after automerge has completed.

e651e8e2

2014-01-19T15:05:08

Introduce diff3 mode for checking out conflicts

thodg/libgit2/src/merge.c

src/merge.c

Log