On 03/06/18 07:58, Elijah Newren wrote: > `git merge-recursive` does a three-way merge between user-specified trees > base, head, and remote. Since the user is allowed to specify head, we can > not necesarily assume that head == HEAD. > > We modify index_has_changes() to take an extra argument specifying the > tree to compare the index to. If NULL, it will compare to HEAD. We then > use this from merge-recursive to make sure we compare to the > user-specified head. > > Signed-off-by: Elijah Newren <new...@gmail.com> > --- > > I'm really unsure where the index_has_changes() declaration should go; > I stuck it in tree.h, but is there a better spot? Err, leave it where it is and '#include "tree.h"' ? :-D ATB, Ramsay Jones
- [RFC PATCH 0/7] merge requirement: index matches head Elijah Newren
- [RFC PATCH 2/7] t6044: add a testcase for index matc... Elijah Newren
- [RFC PATCH 4/7] merge-recursive: fix assumption that... Elijah Newren
- Re: [RFC PATCH 4/7] merge-recursive: fix assumpt... Ramsay Jones
- Re: [RFC PATCH 4/7] merge-recursive: fix ass... brian m. carlson
- Re: [RFC PATCH 4/7] merge-recursive: fix... Ramsay Jones
- Re: [RFC PATCH 4/7] merge-recursive: fix assumpt... Junio C Hamano
- Re: [RFC PATCH 4/7] merge-recursive: fix ass... Elijah Newren
- Re: [RFC PATCH 4/7] merge-recursive: fix... Elijah Newren
- [RFC PATCH 6/7] merge-recursive: enforce rule that i... Elijah Newren
- [RFC PATCH 5/7] t6044: add more testcases with stage... Elijah Newren
- [RFC PATCH 1/7] t6044: verify that merges expected t... Elijah Newren
- [RFC PATCH 3/7] merge-recursive: make sure when we s... Elijah Newren
- [RFC PATCH 7/7] merge: fix misleading pre-merge chec... Elijah Newren