summaryrefslogtreecommitdiff
path: root/git-merge.sh
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2007-05-26 07:33:03 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-05-26 07:33:03 (GMT)
commita23bfaed7da90ccdc75cbfd0099741080381f60a (patch)
treed423650484673c97e53810dfb599f2d6415e6ada /git-merge.sh
parent816366e23dfe366b938b427eac8ea1c8345ea339 (diff)
downloadgit-a23bfaed7da90ccdc75cbfd0099741080381f60a.zip
git-a23bfaed7da90ccdc75cbfd0099741080381f60a.tar.gz
git-a23bfaed7da90ccdc75cbfd0099741080381f60a.tar.bz2
More echo "$user_message" fixes.
Here are fixes to more uses of 'echo "$msg"' where $msg could contain backslashed sequence. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge.sh')
-rwxr-xr-xgit-merge.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/git-merge.sh b/git-merge.sh
index fa45891..bf1fd4f 100755
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -328,7 +328,7 @@ f,*)
then
echo "Wonderful."
result_commit=$(
- echo "$merge_msg" |
+ printf '%s\n' "$merge_msg" |
git-commit-tree $result_tree -p HEAD -p "$1"
) || exit
finish "$result_commit" "In-index merge"
@@ -433,7 +433,7 @@ done
if test '' != "$result_tree"
then
parents=$(git-show-branch --independent "$head" "$@" | sed -e 's/^/-p /')
- result_commit=$(echo "$merge_msg" | git-commit-tree $result_tree $parents) || exit
+ result_commit=$(printf '%s\n' "$merge_msg" | git-commit-tree $result_tree $parents) || exit
finish "$result_commit" "Merge made by $wt_strategy."
dropsave
exit 0
@@ -472,7 +472,7 @@ else
do
echo $remote
done >"$GIT_DIR/MERGE_HEAD"
- echo "$merge_msg" >"$GIT_DIR/MERGE_MSG"
+ printf '%s\n' "$merge_msg" >"$GIT_DIR/MERGE_MSG"
fi
if test "$merge_was_ok" = t