diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-02-03 19:41:33 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-02-03 19:41:33 -0800 |
| commit | c0c74a88f9016dad4665a4f1d446cebb2bdb1968 (patch) | |
| tree | f1a812430ecf8a8e535786696ad5b1d746e5564d /git-merge.sh | |
| parent | 46dc941246af6e845eb7835afdb8cd20eed835b7 (diff) | |
| download | git-c0c74a88f9016dad4665a4f1d446cebb2bdb1968.tar.gz | |
git-merge: Properly quote $merge_msg variable.
Otherwise it would go though shell expansion...
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge.sh')
| -rwxr-xr-x | git-merge.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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 |