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

* dm/add-i-edit-abort: add -i: revisit hunk on editor failure

Merge branch 'dm/add-i-edit-abort'
* dm/add-i-edit-abort: add -i: revisit hunk on editor failure
2e2e91d6 · Junio C Hamano · 229e6582 · 1d398a03 · 2e2e91d6
隐藏空白更改
内联并排

Showing with 4 addition and 0 deletion

git-add--interactive.perl git-add--interactive.perl +4 -0

未找到文件。
--- 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>;