Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'pw/add-p-single'
author
Junio C Hamano
<gitster@pobox.com>
Mon, 2 Apr 2018 17:10:54 +0000
(10:10 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 2 Apr 2018 17:10:55 +0000
(10:10 -0700)
Hotfix.
* pw/add-p-single:
add -p: fix 2.17.0-rc* regression due to moved code
git-add--interactive.perl
patch
|
blob
|
history
raw
(from parent 1:
c2a499e
)
diff --git
a/git-add--interactive.perl
b/git-add--interactive.perl
index d190469cd8b5e1dc427b4029d0d1fb937faef584..c1f52e457f6c5b03947766555e10fba33e7e1b38 100755
(executable)
--- a/
git-add--interactive.perl
+++ b/
git-add--interactive.perl
@@
-1564,7
+1564,7
@@
sub patch_update_file {
error_msg __("No other hunks to search\n");
next;
}
- if ($
1
eq "") {
+ if ($
regex
eq "") {
print colored $prompt_color, __("search for regex? ");
$regex = <STDIN>;
if (defined $regex) {