From c0c74a88f9016dad4665a4f1d446cebb2bdb1968 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 3 Feb 2006 19:41:33 -0800 Subject: git-merge: Properly quote $merge_msg variable. Otherwise it would go though shell expansion... Signed-off-by: Junio C Hamano --- git-merge.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'git-merge.sh') diff --git a/git-merge.sh b/git-merge.sh index 92e5a65cae..8c0a92c147 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 -- cgit v1.2.3