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

* dm/add-i-edit-abort: add -i: revisit hunk on editor failure
git-mirror · Mar 5, 2009 · 2e2e91d · 2e2e91d
2 parents 229e658 + 1d398a0
commit 2e2e91d
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/git-add--interactive.perl b/git-add--interactive.perl
@@ -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>;