diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-09-18 11:59:50 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-09-18 11:59:51 -0700 |
| commit | b25b9d5939b9ae35a728e1dbdc3a0fea03c79c4d (patch) | |
| tree | db8338dc222d1cb5a16a5488f0f0b3ef694a8625 | |
| parent | dd42145b1e953fe579778c13a3ad34aa59aa95fe (diff) | |
| parent | 89b0230a20e435c02effafd3de16bb105d652505 (diff) | |
| download | git-b25b9d5939b9ae35a728e1dbdc3a0fea03c79c4d.tar.gz | |
Merge branch 'mm/no-shell-escape-in-die-message' into maint
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"
| -rw-r--r-- | git-sh-setup.sh | 2 | ||||
| -rwxr-xr-x | t/t3404-rebase-interactive.sh | 13 |
2 files changed, 14 insertions, 1 deletions
diff --git a/git-sh-setup.sh b/git-sh-setup.sh index 7a964ad2ff..e15be51636 100644 --- a/git-sh-setup.sh +++ b/git-sh-setup.sh @@ -53,7 +53,7 @@ die () { die_with_status () { status=$1 shift - echo >&2 "$*" + printf >&2 '%s\n' "$*" exit "$status" } 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 |