summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-05-22 12:41:55 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-05-22 12:41:55 -0700
commit29b2041c2a91d2f80afa9d4e0f6eeb77a3ff5bc6 (patch)
treee0ba066f9c04441aef5d34c41e24751415233da7 /t
parentMerge branch 'sg/completion-config' (diff)
parentadd: check return value of launch_editor (diff)
downloadtgif-29b2041c2a91d2f80afa9d4e0f6eeb77a3ff5bc6.tar.xz
Merge branch 'jk/add-e-kill-editor'
"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
Diffstat (limited to 't')
-rwxr-xr-xt/t3702-add-edit.sh7
1 files changed, 7 insertions, 0 deletions
diff --git a/t/t3702-add-edit.sh b/t/t3702-add-edit.sh
index 4ee47cc9a8..3cb74ca296 100755
--- a/t/t3702-add-edit.sh
+++ b/t/t3702-add-edit.sh
@@ -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