diff options
author | Junio C Hamano <junkio@cox.net> | 2007-05-27 01:53:22 (GMT) |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2007-05-27 01:53:22 (GMT) |
commit | c56ed464b0ba275d9f2e3598c61b391e98fc217b (patch) | |
tree | f8d204103c41c8decf415c34a1b48b8c9bc9bd54 /git-am.sh | |
parent | ddcf786fd7d5755711439371dcfd9a7ba1dfa7a5 (diff) | |
parent | d1c7c27ea3d9c92be2c7a9c5fc72ba5f228c424a (diff) | |
download | git-c56ed464b0ba275d9f2e3598c61b391e98fc217b.zip git-c56ed464b0ba275d9f2e3598c61b391e98fc217b.tar.gz git-c56ed464b0ba275d9f2e3598c61b391e98fc217b.tar.bz2 |
Merge branch 'maint'
* maint:
Fix git-svn to handle svn not reporting the md5sum of a file, and test.
Fix mishandling of $Id$ expanded in the repository copy in convert.c
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-am.sh')
-rwxr-xr-x | git-am.sh | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -18,7 +18,7 @@ stop_here () { stop_here_user_resolve () { if [ -n "$resolvemsg" ]; then - echo "$resolvemsg" + printf '%s\n' "$resolvemsg" stop_here $1 fi cmdline=$(basename $0) @@ -146,7 +146,7 @@ do git_apply_opt="$git_apply_opt $1"; shift ;; --resolvemsg=*) - resolvemsg=$(echo "$1" | sed -e "s/^--resolvemsg=//"); shift ;; + resolvemsg=${1#--resolvemsg=}; shift ;; --) shift; break ;; @@ -331,7 +331,7 @@ do ADD_SIGNOFF= fi { - echo "$SUBJECT" + printf '%s\n' "$SUBJECT" if test -s "$dotest/msg-clean" then echo @@ -394,7 +394,7 @@ do fi echo - echo "Applying '$SUBJECT'" + printf 'Applying %s\n' "$SUBJECT" echo case "$resolved" in |