Merge branch 'pw/add-p-single'

Hotfix.

* pw/add-p-single:
  add -p: fix 2.17.0-rc* regression due to moved code
This commit is contained in:
Junio C Hamano 2018-04-02 10:10:54 -07:00
commit 5f9441769f

View File

@ -1564,7 +1564,7 @@ sub patch_update_file {
error_msg __("No other hunks to search\n"); error_msg __("No other hunks to search\n");
next; next;
} }
if ($1 eq "") { if ($regex eq "") {
print colored $prompt_color, __("search for regex? "); print colored $prompt_color, __("search for regex? ");
$regex = <STDIN>; $regex = <STDIN>;
if (defined $regex) { if (defined $regex) {