summaryrefslogtreecommitdiff
path: root/git-merge.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-05-26 08:30:40 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-05-26 08:30:40 (GMT)
commitd1c7c27ea3d9c92be2c7a9c5fc72ba5f228c424a (patch)
tree929a074f6c4001add762cdaefc11887a6a291966 /git-merge.sh
parentc23290d528c208a25641f0fc278bac9bb9838265 (diff)
parent20b3d206acbbb042c7ad5f42d36ff8d036a538c5 (diff)
downloadgit-d1c7c27ea3d9c92be2c7a9c5fc72ba5f228c424a.zip
git-d1c7c27ea3d9c92be2c7a9c5fc72ba5f228c424a.tar.gz
git-d1c7c27ea3d9c92be2c7a9c5fc72ba5f228c424a.tar.bz2
Merge branch 'maint-1.5.1' into maint
* maint-1.5.1: Fix git-svn to handle svn not reporting the md5sum of a file, and test. More echo "$user_message" fixes. Add tests for the last two fixes. git-commit: use printf '%s\n' instead of echo on user-supplied strings git-am: use printf instead of echo on user-supplied strings Documentation: Add definition of "evil merge" to GIT Glossary Replace the last 'dircache's by 'index' Documentation: Clean up links in GIT Glossary
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 7ebbce4..b2f8a2a 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