Merge branch 'ar/unlink-err' into maint

diff --git a/git-add--interactive.perl b/git-add--interactive.perl
index 5407b2e1b88cef5b9124ef9dca79cd1f95018bae..f6e536ece314316ebb281721ed27d7519577202f 100755 (executable)
--- a/git-add--interactive.perl
+++ b/git-add--interactive.perl
@@ -804,6 +804,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>;