diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-03-05 15:41:39 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-03-05 15:41:39 -0800 |
| commit | 2e2e91d6b27f522707322835a1f8c4a5e18a2419 (patch) | |
| tree | 34e2d38440f0b773408490d0bf793fd91119b20c | |
| parent | 229e65823afca5151afa44f7d3978926b2b1b2b7 (diff) | |
| parent | 1d398a03902aab8ec49197d8827c19f9e2203c98 (diff) | |
| download | git-2e2e91d6b27f522707322835a1f8c4a5e18a2419.tar.gz | |
Merge branch 'dm/add-i-edit-abort'
* dm/add-i-edit-abort:
add -i: revisit hunk on editor failure
| -rwxr-xr-x | git-add--interactive.perl | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/git-add--interactive.perl b/git-add--interactive.perl index 5f129a4203..f7b0761732 100755 --- a/git-add--interactive.perl +++ b/git-add--interactive.perl @@ -753,6 +753,10 @@ EOF || $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>; |