From: Junio C Hamano <junkio@cox.net>
Date: Sat, 4 Feb 2006 03:41:33 +0000 (-0800)
Subject: git-merge: Properly quote $merge_msg variable.
X-Git-Tag: v1.2.0~68
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=c0c74a88f9016dad4665a4f1d446cebb2bdb1968;p=git.git

git-merge: Properly quote $merge_msg variable.

Otherwise it would go though shell expansion...

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/git-merge.sh b/git-merge.sh
index 92e5a65ca..8c0a92c14 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