Skip to content

Commit

Permalink
Merge branch 'jk/add-i-read-error'
Browse files Browse the repository at this point in the history
"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
  • Loading branch information
Junio C Hamano committed Jan 7, 2015
2 parents 04950c7 + a8bec7a commit abac75c
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions git-add--interactive.perl
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit abac75c

Please sign in to comment.