summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-09-04 12:32:15 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-09-04 12:32:16 -0700
commitaaf4d399f4dcf2b841d9dab53612374bc877bb07 (patch)
treef2d7b026b9e90ed5468ca8c541a7255be69f682c /t
parentMerge branch 'tr/fd-gotcha-fixes' (diff)
parentdie_with_status: use "printf '%s\n'", not "echo" (diff)
downloadtgif-aaf4d399f4dcf2b841d9dab53612374bc877bb07.tar.xz
Merge branch 'mm/no-shell-escape-in-die-message'
Fixes a minor bug in "git rebase -i" (there could be others, as the root cause is pretty generic) where the code feeds a random, data dependeant string to 'echo' and expects it to come out literally. * mm/no-shell-escape-in-die-message: die_with_status: use "printf '%s\n'", not "echo"
Diffstat (limited to 't')
-rwxr-xr-xt/t3404-rebase-interactive.sh13
1 files changed, 13 insertions, 0 deletions
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index 49ccb38f88..4dbeddb0de 100755
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -976,4 +976,17 @@ test_expect_success 'rebase -i with --strategy and -X' '
test $(cat file1) = Z
'
+test_expect_success 'rebase -i error on commits with \ in message' '
+ current_head=$(git rev-parse HEAD)
+ test_when_finished "git rebase --abort; git reset --hard $current_head; rm -f error" &&
+ test_commit TO-REMOVE will-conflict old-content &&
+ test_commit "\temp" will-conflict new-content dummy &&
+ (
+ EDITOR=true &&
+ export EDITOR &&
+ test_must_fail git rebase -i HEAD^ --onto HEAD^^ 2>error
+ ) &&
+ test_expect_code 1 grep " emp" error
+'
+
test_done