Browse Source

git-merge: Properly quote $merge_msg variable.

Otherwise it would go though shell expansion...

Signed-off-by: Junio C Hamano <junkio@cox.net>
maint
Junio C Hamano 19 years ago
parent
commit
c0c74a88f9
  1. 2
      git-merge.sh

2
git-merge.sh

@ -293,7 +293,7 @@ for remote @@ -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

Loading…
Cancel
Save