git-merge: Properly quote $merge_msg variable.
Otherwise it would go though shell expansion... Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
46dc941246
commit
c0c74a88f9
@ -293,7 +293,7 @@ for remote
|
|||||||
do
|
do
|
||||||
echo $remote
|
echo $remote
|
||||||
done >"$GIT_DIR/MERGE_HEAD"
|
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
|
if test "$merge_was_ok" = t
|
||||||
then
|
then
|
||||||
|
Loading…
Reference in New Issue
Block a user