Skip to content

Commit

Permalink
git-merge: Properly quote $merge_msg variable.
Browse files Browse the repository at this point in the history
Otherwise it would go though shell expansion...

Signed-off-by: Junio C Hamano <junkio@cox.net>
  • Loading branch information
Junio C Hamano committed Feb 4, 2006
1 parent 46dc941 commit c0c74a8
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion git-merge.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit c0c74a8

Please sign in to comment.