Re: [RFC PATCH 4/7] merge-recursive: fix assumption that head tree being merged is HEAD

2018-06-11 Thread Elijah Newren
On Tue, Jun 5, 2018 at 12:14 AM, Elijah Newren wrote: > On Sun, Jun 3, 2018 at 8:19 PM, Junio C Hamano wrote: >> Elijah Newren writes: >> >>> `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

Re: [RFC PATCH 4/7] merge-recursive: fix assumption that head tree being merged is HEAD

2018-06-05 Thread Elijah Newren
On Sun, Jun 3, 2018 at 8:19 PM, Junio C Hamano wrote: > Elijah Newren writes: > >> `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

Re: [RFC PATCH 4/7] merge-recursive: fix assumption that head tree being merged is HEAD

2018-06-03 Thread Junio C Hamano
Elijah Newren writes: > `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 >

Re: [RFC PATCH 4/7] merge-recursive: fix assumption that head tree being merged is HEAD

2018-06-03 Thread Ramsay Jones
On 04/06/18 00:37, brian m. carlson wrote: > On Sun, Jun 03, 2018 at 02:52:12PM +0100, Ramsay Jones wrote: >> On 03/06/18 07:58, Elijah Newren wrote: >>> 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

Re: [RFC PATCH 4/7] merge-recursive: fix assumption that head tree being merged is HEAD

2018-06-03 Thread brian m. carlson
On Sun, Jun 03, 2018 at 02:52:12PM +0100, Ramsay Jones wrote: > On 03/06/18 07:58, Elijah Newren wrote: > > 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 Or

Re: [RFC PATCH 4/7] merge-recursive: fix assumption that head tree being merged is HEAD

2018-06-03 Thread Ramsay Jones
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

[RFC PATCH 4/7] merge-recursive: fix assumption that head tree being merged is HEAD

2018-06-03 Thread Elijah Newren
`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