undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/add-e-kill-editor'

Browse Source 
"git add -e" did not allow the user to abort the operation by
killing the editor.

* jk/add-e-kill-editor:
  add: check return value of launch_editor
This commit is contained in:
Junio C Hamano 2015-05-22 12:41:55 -07:00
commit 29b2041c2a
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
builtin/add.c
View File

@ -209,7 +209,8 @@ static int edit_patch(int argc, const char **argv, const char *prefix)
if (run_diff_files(&rev, 0)) if (run_diff_files(&rev, 0))
die(_("Could not write patch")); die(_("Could not write patch"));
launch_editor(file, NULL, NULL); if (launch_editor(file, NULL, NULL))
die(_("editing patch failed"));
if (stat(file, &st)) if (stat(file, &st))
die_errno(_("Could not stat '%s'"), file); die_errno(_("Could not stat '%s'"), file);

7
t/t3702-add-edit.sh
View File

@ -118,4 +118,11 @@ test_expect_success 'add -e' '
' '
test_expect_success 'add -e notices editor failure' '
git reset --hard &&
echo change >>file &&
test_must_fail env GIT_EDITOR=false git add -e &&
test_expect_code 1 git diff --exit-code
'
test_done test_done