kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'dm/add-i-edit-abort' 

* dm/add-i-edit-abort:
  add -i: revisit hunk on editor failure
maint
Junio C Hamano 2009-03-05 15:41:39 -08:00
parent 229e65823a 1d398a0390
commit 2e2e91d6b2
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 @@ EOF
|| $ENV{VISUAL} || $ENV{EDITOR} || "vi"; || $ENV{VISUAL} || $ENV{EDITOR} || "vi";
system('sh', '-c', $editor.' "$@"', $editor, $hunkfile); system('sh', '-c', $editor.' "$@"', $editor, $hunkfile);


if ($? != 0) {
return undef;
}

open $fh, '<', $hunkfile open $fh, '<', $hunkfile
or die "failed to open hunk edit file for reading: " . $!; or die "failed to open hunk edit file for reading: " . $!;
my @newtext = grep { !/^#/ } <$fh>; my @newtext = grep { !/^#/ } <$fh>;