diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-05-26 08:30:40 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-05-26 08:30:40 (GMT) |
| commit | d1c7c27ea3d9c92be2c7a9c5fc72ba5f228c424a (patch) | |
| tree | 929a074f6c4001add762cdaefc11887a6a291966 /git-commit.sh | |
| parent | c23290d528c208a25641f0fc278bac9bb9838265 (diff) | |
| parent | 20b3d206acbbb042c7ad5f42d36ff8d036a538c5 (diff) | |
| download | git-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-commit.sh')
| -rwxr-xr-x | git-commit.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/git-commit.sh b/git-commit.sh index f28fc24..e8b60f7 100755 --- a/git-commit.sh +++ b/git-commit.sh @@ -376,12 +376,12 @@ t,) rm -f "$TMP_INDEX" fi || exit - echo "$commit_only" | + printf '%s\n' "$commit_only" | GIT_INDEX_FILE="$TMP_INDEX" \ git-update-index --add --remove --stdin && save_index && - echo "$commit_only" | + printf '%s\n' "$commit_only" | ( GIT_INDEX_FILE="$NEXT_INDEX" export GIT_INDEX_FILE @@ -432,7 +432,7 @@ fi if test "$log_message" != '' then - echo "$log_message" + printf '%s\n' "$log_message" elif test "$logfile" != "" then if test "$logfile" = - @@ -475,7 +475,7 @@ if test -f "$GIT_DIR/MERGE_HEAD" && test -z "$no_edit"; then echo "#" echo "# It looks like you may be committing a MERGE." echo "# If this is not correct, please remove the file" - echo "# $GIT_DIR/MERGE_HEAD" + printf '%s\n' "# $GIT_DIR/MERGE_HEAD" echo "# and try again" echo "#" fi >>"$GIT_DIR"/COMMIT_EDITMSG |