Re: [PATCH v2] add -p: fix 2.17.0-rc* regression due to moved code

2018-03-31 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > diff --git a/git-add--interactive.perl b/git-add--interactive.perl > index d190469cd8..c1f52e457f 100755 > --- a/git-add--interactive.perl > +++ b/git-add--interactive.perl > @@ -1561,13 +1561,13 @@ sub patch_update_file { >

Re: [PATCH v2] add -p: fix 2.17.0-rc* regression due to moved code

2018-03-31 Thread Ævar Arnfjörð Bjarmason
On Sat, Mar 31 2018, Phillip Wood wrote: > On 31/03/18 13:50, Ævar Arnfjörð Bjarmason wrote: >> Fix a regression in 88f6ffc1c2 ("add -p: only bind search key if >> there's more than one hunk", 2018-02-13) which is present in >> 2.17.0-rc*, but not 2.16.0. >> >> In Perl, regex variables like $1

Re: [PATCH v2] add -p: fix 2.17.0-rc* regression due to moved code

2018-03-31 Thread Phillip Wood
On 31/03/18 13:50, Ævar Arnfjörð Bjarmason wrote: Fix a regression in 88f6ffc1c2 ("add -p: only bind search key if there's more than one hunk", 2018-02-13) which is present in 2.17.0-rc*, but not 2.16.0. In Perl, regex variables like $1 always refer to the last regex match. When the

[PATCH v2] add -p: fix 2.17.0-rc* regression due to moved code

2018-03-31 Thread Ævar Arnfjörð Bjarmason
Fix a regression in 88f6ffc1c2 ("add -p: only bind search key if there's more than one hunk", 2018-02-13) which is present in 2.17.0-rc*, but not 2.16.0. In Perl, regex variables like $1 always refer to the last regex match. When the aforementioned change added a new regex match between the old