development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-27 11:39:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source 
* dm/add-i-edit-abort:
  add -i: revisit hunk on editor failure
This commit is contained in:
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 @@ 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>;