summaryrefslogtreecommitdiff
path: root/git-am.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-am.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-am.sh')
-rwxr-xr-xgit-am.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-am.sh b/git-am.sh
index 543efd0..8b57129 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -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 ;;