Re: [PATCH v4 17/23] read-cache.c: remove an implicit dependency on the_index

2018-06-09 Thread Elijah Newren
On Sat, Jun 9, 2018 at 11:45 AM, Duy Nguyen wrote: > On Sat, Jun 9, 2018 at 8:10 PM Elijah Newren wrote: >> >> On Wed, Jun 6, 2018 at 10:02 AM, Nguyễn Thái Ngọc Duy >> wrote: >> > diff --git a/merge-recursive.c b/merge-recursive.c >> > index b404ebac7c..4f054d6dbb 100644 >> > --- a/merge-recurs

Re: [PATCH v4 17/23] read-cache.c: remove an implicit dependency on the_index

2018-06-09 Thread Duy Nguyen
On Sat, Jun 9, 2018 at 8:10 PM Elijah Newren wrote: > > On Wed, Jun 6, 2018 at 10:02 AM, Nguyễn Thái Ngọc Duy > wrote: > > diff --git a/merge-recursive.c b/merge-recursive.c > > index b404ebac7c..4f054d6dbb 100644 > > --- a/merge-recursive.c > > +++ b/merge-recursive.c > > @@ -315,7 +315,7 @@ st

Re: [PATCH v4 17/23] read-cache.c: remove an implicit dependency on the_index

2018-06-09 Thread Elijah Newren
On Wed, Jun 6, 2018 at 10:02 AM, Nguyễn Thái Ngọc Duy wrote: > diff --git a/merge-recursive.c b/merge-recursive.c > index b404ebac7c..4f054d6dbb 100644 > --- a/merge-recursive.c > +++ b/merge-recursive.c > @@ -315,7 +315,7 @@ static int add_cacheinfo(struct merge_options *o, > struct cache

[PATCH v4 17/23] read-cache.c: remove an implicit dependency on the_index

2018-06-06 Thread Nguyễn Thái Ngọc Duy
Make some index API take an index_state instead of assuming the_index in read-cache.c. All external call sites are converted blindly to keep the patch simple and retain current behavior. Individual call sites may receive further updates to use the right index instead of the_index. Signed-off-by: