Merge branch 'pw/add-p-single'

gitster · gitster · commit 5f9441769fab · 2018-04-02T10:10:55.000-07:00
Hotfix.

* pw/add-p-single:
  add -p: fix 2.17.0-rc* regression due to moved code
diff --git 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) {

Original file line number	Diff line number	Diff line change
`@@ -1564,7 +1564,7 @@ sub patch_update_file {`
`1564`	`1564`	`error_msg __("No other hunks to search\n");`
`1565`	`1565`	`next;`
`1566`	`1566`	`}`
`1567`		`- if ($1 eq "") {`
	`1567`	`+ if ($regex eq "") {`
`1568`	`1568`	`print colored $prompt_color, __("search for regex? ");`
`1569`	`1569`	`$regex = <STDIN>;`
`1570`	`1570`	`if (defined $regex) {`