summaryrefslogtreecommitdiff
path: root/git-merge.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-02-04 03:41:33 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-02-04 03:41:33 (GMT)
commitc0c74a88f9016dad4665a4f1d446cebb2bdb1968 (patch)
treef1a812430ecf8a8e535786696ad5b1d746e5564d /git-merge.sh
parent46dc941246af6e845eb7835afdb8cd20eed835b7 (diff)
downloadgit-c0c74a88f9016dad4665a4f1d446cebb2bdb1968.zip
git-c0c74a88f9016dad4665a4f1d446cebb2bdb1968.tar.gz
git-c0c74a88f9016dad4665a4f1d446cebb2bdb1968.tar.bz2
git-merge: Properly quote $merge_msg variable.
Otherwise it would go though shell expansion... Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge.sh')
-rwxr-xr-xgit-merge.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-merge.sh b/git-merge.sh
index 92e5a65..8c0a92c 100755
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -293,7 +293,7 @@ for remote
do
echo $remote
done >"$GIT_DIR/MERGE_HEAD"
-echo $merge_msg >"$GIT_DIR/MERGE_MSG"
+echo "$merge_msg" >"$GIT_DIR/MERGE_MSG"
if test "$merge_was_ok" = t
then