mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-19 15:59:37 +02:00
Code

add -i: revisit hunk on editor failure 

Similar to the behaviour for editing a commit message, let terminating
the editor with a failure abort the current hunk edit and revisit the
option selection for the hunk.

Signed-off-by: Deskin Miller <deskinm@umich.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Deskin Miller 2009-02-12 00:19:41 -05:00 committed by Junio C Hamano
parent 30aa4fb15f
commit 1d398a0390
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
git-add--interactive.perl
View File

@ -753,6 +753,10 @@ sub edit_hunk_manually {
|| $ENV{VISUAL} || $ENV{EDITOR} || "vi";
system('sh', '-c', $editor.' "$@"', $editor, $hunkfile);
if ($? != 0) {
return undef;
}
open $fh, '<', $hunkfile
or die "failed to open hunk edit file for reading: " . $!;
my @newtext = grep { !/^#/ } <$fh>;