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 <newren@xxxxxxxxx> > --- > > 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
