diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-01-07 21:05:58 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-01-07 21:05:58 (GMT) |
| commit | abac75c207be5ad062d6fe8ff9938ddf8e405c83 (patch) | |
| tree | 5e062b4c6fca0027725b187649a25fbc1b3bbf1c | |
| parent | 04950c714107345c92c5287bcef8f1eab7318391 (diff) | |
| parent | a8bec7abcc78db991026ed20e16edf46141d6a77 (diff) | |
| download | git-abac75c207be5ad062d6fe8ff9938ddf8e405c83.zip git-abac75c207be5ad062d6fe8ff9938ddf8e405c83.tar.gz git-abac75c207be5ad062d6fe8ff9938ddf8e405c83.tar.bz2 | |
Merge branch 'jk/add-i-read-error'
"git add -i" did not notice when the interactive command input
stream went away and kept asking.
* jk/add-i-read-error:
add--interactive: leave main loop on read error
| -rwxr-xr-x | git-add--interactive.perl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/git-add--interactive.perl b/git-add--interactive.perl index 1fadd69..c725674 100755 --- a/git-add--interactive.perl +++ b/git-add--interactive.perl @@ -1356,6 +1356,7 @@ sub patch_update_file { $patch_mode_flavour{TARGET}, " [y,n,q,a,d,/$other,?]? "; my $line = prompt_single_character; + last unless defined $line; if ($line) { if ($line =~ /^y/i) { $hunk[$ix]{USE} = 1; |