Re: [PATCH v4 00/23] Fix incorrect use of the_index

2018-06-14 Thread Elijah Newren
On Thu, Jun 14, 2018 at 10:18 AM, Duy Nguyen wrote: > On Mon, Jun 11, 2018 at 06:49:00PM +0200, Duy Nguyen wrote: >> On Mon, Jun 11, 2018 at 6:44 PM Elijah Newren wrote: >> > > What about merge-recursive.c? Given that this whole thing will take >> > > many release cycles to finish, your work may

Re: [PATCH v4 00/23] Fix incorrect use of the_index

2018-06-14 Thread Duy Nguyen
On Mon, Jun 11, 2018 at 06:49:00PM +0200, Duy Nguyen wrote: > On Mon, Jun 11, 2018 at 6:44 PM Elijah Newren wrote: > > > What about merge-recursive.c? Given that this whole thing will take > > > many release cycles to finish, your work may get merged before mine > > > and I could do the

Re: [PATCH v4 00/23] Fix incorrect use of the_index

2018-06-11 Thread Duy Nguyen
On Mon, Jun 11, 2018 at 6:05 PM Duy Nguyen wrote: > > On Sat, Jun 9, 2018 at 9:58 PM Elijah Newren wrote: > > I read over the rest. Found a small grammatical error in a commit > > message. Found multiple places that still need conversion, from > > pushing up _index usages to callers of

Re: [PATCH v4 00/23] Fix incorrect use of the_index

2018-06-11 Thread Duy Nguyen
On Mon, Jun 11, 2018 at 6:44 PM Elijah Newren wrote: > > What about merge-recursive.c? Given that this whole thing will take > > many release cycles to finish, your work may get merged before mine > > and I could do the conversion now (and resolve conflicts and resubmit > > later). Of course if

Re: [PATCH v4 00/23] Fix incorrect use of the_index

2018-06-11 Thread Elijah Newren
On Mon, Jun 11, 2018 at 9:24 AM, Duy Nguyen wrote: >> I was just about to send you an email to ask if you were continuing on >> with the series. I need diff-lib.c converted in order to make the >> changes Junio suggested to index_has_changes at >>

Re: [PATCH v4 00/23] Fix incorrect use of the_index

2018-06-11 Thread Duy Nguyen
On Mon, Jun 11, 2018 at 6:11 PM Elijah Newren wrote: > > Hi Duy, > > On Mon, Jun 11, 2018 at 9:05 AM, Duy Nguyen wrote: > > On Sat, Jun 9, 2018 at 9:58 PM Elijah Newren wrote: > >> I read over the rest. Found a small grammatical error in a commit > >> message. Found multiple places that still

Re: [PATCH v4 00/23] Fix incorrect use of the_index

2018-06-11 Thread Elijah Newren
Hi Duy, On Mon, Jun 11, 2018 at 9:05 AM, Duy Nguyen wrote: > On Sat, Jun 9, 2018 at 9:58 PM Elijah Newren wrote: >> I read over the rest. Found a small grammatical error in a commit >> message. Found multiple places that still need conversion, from >> pushing up _index usages to callers of

Re: [PATCH v4 00/23] Fix incorrect use of the_index

2018-06-11 Thread Duy Nguyen
On Sat, Jun 9, 2018 at 9:58 PM Elijah Newren wrote: > I read over the rest. Found a small grammatical error in a commit > message. Found multiple places that still need conversion, from > pushing up _index usages to callers of ll-merge.c and sha1-file.c > instead of having them in those files,

Re: [PATCH v4 00/23] Fix incorrect use of the_index

2018-06-09 Thread Elijah Newren
On Thu, Jun 7, 2018 at 12:44 AM, Elijah Newren wrote: > On Wed, Jun 6, 2018 at 9:49 AM, Nguyễn Thái Ngọc Duy > wrote: >> v4 fixes some commit messages and killed a couple more the_index >> references after I tried to merge this with 'pu' > > Thanks for tackling this. The first 8 patches look

Re: [PATCH v4 00/23] Fix incorrect use of the_index

2018-06-07 Thread Elijah Newren
On Wed, Jun 6, 2018 at 9:49 AM, Nguyễn Thái Ngọc Duy wrote: > v4 fixes some commit messages and killed a couple more the_index > references after I tried to merge this with 'pu' Thanks for tackling this. The first 8 patches look good to me other than the typo I pointed out on patch 4. However,

[PATCH v4 00/23] Fix incorrect use of the_index

2018-06-06 Thread Nguyễn Thái Ngọc Duy
v4 fixes some commit messages and killed a couple more the_index references after I tried to merge this with 'pu' diff --git a/apply.c b/apply.c index 811ff2ad5e..82f681972f 100644 --- a/apply.c +++ b/apply.c @@ -4090,9 +4090,9 @@ static int build_fake_ancestor(struct apply_state *state, struct