summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUwe Storbeck <uwe@ibr.ch>2014-03-15 00:56:43 +0100
committerJunio C Hamano <gitster@pobox.com>2014-03-17 12:24:14 -0700
commit47be06602656ee9cac860f675d2c8d1f0deabdbe (patch)
tree4541122272ed41cbee9ec6152632ad8bd25b34d7
parent16216b6ab1073b7aaa8225c32208758e6ea16629 (diff)
downloadgit-47be06602656ee9cac860f675d2c8d1f0deabdbe.tar.gz
rebase -i: do not "echo" random user-supplied strings
In some places we "echo" a string that comes from a commit log message, which may have a backslash sequence that is interpreted by the command (POSIX.1 allows this), most notably "dash"'s built-in 'echo'. A commit message which contains the string '\n' (or ends with the string '\c') may result in a garbage line in the todo list of an interactive rebase which causes the rebase to fail. To reproduce the behavior (with dash as /bin/sh): mkdir test && cd test && git init echo 1 >foo && git add foo git commit -m"this commit message ends with '\n'" echo 2 >foo && git commit -a --fixup HEAD git rebase -i --autosquash --root Now the editor opens with garbage in line 3 which has to be removed or the rebase fails. Signed-off-by: Uwe Storbeck <uwe@ibr.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--git-rebase--interactive.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 43c19e0829..43631b4723 100644
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -739,7 +739,7 @@ rearrange_squash () {
;;
esac
done
- echo "$sha1 $action $prefix $rest"
+ printf '%s %s %s %s\n' "$sha1" "$action" "$prefix" "$rest"
# if it's a single word, try to resolve to a full sha1 and
# emit a second copy. This allows us to match on both message
# and on sha1 prefix