Re: [PATCH 2/3] move index_has_changes() from builtin/am.c to merge.c for reuse

2017-12-22 Thread Elijah Newren
On Fri, Dec 22, 2017 at 12:46 PM, Junio C Hamano wrote: > Elijah Newren writes: > >> On Thu, Dec 21, 2017 at 11:19 AM, Elijah Newren wrote: >>> index_has_changes() is a function we want to reuse outside of just am, >>> making it also

Re: [PATCH 2/3] move index_has_changes() from builtin/am.c to merge.c for reuse

2017-12-22 Thread Junio C Hamano
Elijah Newren writes: > On Thu, Dec 21, 2017 at 11:19 AM, Elijah Newren wrote: >> index_has_changes() is a function we want to reuse outside of just am, >> making it also available for merge-recursive and merge-ort. >> >> Signed-off-by: Elijah Newren

Re: [PATCH 2/3] move index_has_changes() from builtin/am.c to merge.c for reuse

2017-12-21 Thread Elijah Newren
On Thu, Dec 21, 2017 at 11:19 AM, Elijah Newren wrote: > index_has_changes() is a function we want to reuse outside of just am, > making it also available for merge-recursive and merge-ort. > > Signed-off-by: Elijah Newren > --- Note: These patches built on

[PATCH 2/3] move index_has_changes() from builtin/am.c to merge.c for reuse

2017-12-21 Thread Elijah Newren
index_has_changes() is a function we want to reuse outside of just am, making it also available for merge-recursive and merge-ort. Signed-off-by: Elijah Newren --- builtin/am.c | 37 - cache.h | 9 + merge.c | 33