path: root/git-add--interactive.perl
diff options
authorÆvar Arnfjörð Bjarmason <>2018-03-31 12:50:58 (GMT)
committerJunio C Hamano <>2018-04-01 04:54:28 (GMT)
commitfd2fb4aa0cc2a25a8e4ddf3f3c48880f317edcf4 (patch)
tree2c587cca86c682909e97401e02c8c0a4102817cc /git-add--interactive.perl
parent4bdd6e7ce33c72dfaa79c4139d30bd809ec8eda7 (diff)
add -p: fix 2.17.0-rc* regression due to moved code
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 match and the corresponding code that was expecting $1, the $1 variable would always be undef, since the newly inserted regex match doesn't have any captures. As a result the "/" feature to search for a string in a hunk by regex completely broke, on git.git: $ perl -pi -e 's/Git/Tig/g' $ ./git --exec-path=$PWD add -p [..] Stage this hunk [y,n,q,a,d,j,J,g,/,s,e,?]? s Split into 4 hunks. [...] Stage this hunk [y,n,q,a,d,j,J,g,/,s,e,?]? /Many Use of uninitialized value $1 in string eq at /home/avar/g/git/git-add--interactive line 1568, <STDIN> line 1. search for regex? Many I.e. the initial "/regex" command wouldn't work, and would always emit a warning and ask again for a regex, now it works as intended again. Signed-off-by: Ævar Arnfjörð Bjarmason <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'git-add--interactive.perl')
1 files changed, 1 insertions, 1 deletions
diff --git a/git-add--interactive.perl b/git-add--interactive.perl
index d9d8ff3..811b373 100755
--- a/git-add--interactive.perl
+++ b/git-add--interactive.perl
@@ -1492,7 +1492,7 @@ sub patch_update_file {
error_msg __("No other hunks to search\n");
- if ($1 eq "") {
+ if ($regex eq "") {
print colored $prompt_color, __("search for regex? ");
$regex = <STDIN>;
if (defined $regex) {