mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More echo "$user_message" fixes.

Browse Source 
Here are fixes to more uses of 'echo "$msg"' where $msg could contain
backslashed sequence.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Jeff King
2007-05-26 00:33:03 -07:00
committed by Junio C Hamano
parent 816366e23d
commit a23bfaed7d
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
git-am.sh
View File

@ -18,7 +18,7 @@ stop_here () {
stop_here_user_resolve () { stop_here_user_resolve () {
if [ -n "$resolvemsg" ]; then if [ -n "$resolvemsg" ]; then
echo "$resolvemsg" printf '%s\n' "$resolvemsg"
stop_here $1 stop_here $1
fi fi
cmdline=$(basename $0) cmdline=$(basename $0)
@ -146,7 +146,7 @@ do
git_apply_opt="$git_apply_opt $1"; shift ;; git_apply_opt="$git_apply_opt $1"; shift ;;
--resolvemsg=*) --resolvemsg=*)
resolvemsg=$(echo "$1" | sed -e "s/^--resolvemsg=//"); shift ;; resolvemsg=${1#--resolvemsg=}; shift ;;
--) --)
shift; break ;; shift; break ;;

6
git-merge.sh
View File

@ -328,7 +328,7 @@ f,*)
then then
echo "Wonderful." echo "Wonderful."
result_commit=$( result_commit=$(
echo "$merge_msg" | printf '%s\n' "$merge_msg" |
git-commit-tree $result_tree -p HEAD -p "$1" git-commit-tree $result_tree -p HEAD -p "$1"
) || exit ) || exit
finish "$result_commit" "In-index merge" finish "$result_commit" "In-index merge"
@ -433,7 +433,7 @@ done
if test '' != "$result_tree" if test '' != "$result_tree"
then then
parents=$(git-show-branch --independent "$head" "$@" | sed -e 's/^/-p /') 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." finish "$result_commit" "Merge made by $wt_strategy."
dropsave dropsave
exit 0 exit 0
@ -472,7 +472,7 @@ else
do do
echo $remote echo $remote
done >"$GIT_DIR/MERGE_HEAD" done >"$GIT_DIR/MERGE_HEAD"
echo "$merge_msg" >"$GIT_DIR/MERGE_MSG" printf '%s\n' "$merge_msg" >"$GIT_DIR/MERGE_MSG"
fi fi
if test "$merge_was_ok" = t if test "$merge_was_ok" = t

2
git-tag.sh
View File

@ -126,7 +126,7 @@ if [ "$annotate" ]; then
echo "#" ) > "$GIT_DIR"/TAG_EDITMSG echo "#" ) > "$GIT_DIR"/TAG_EDITMSG
${VISUAL:-${EDITOR:-vi}} "$GIT_DIR"/TAG_EDITMSG || exit ${VISUAL:-${EDITOR:-vi}} "$GIT_DIR"/TAG_EDITMSG || exit
else else
echo "$message" >"$GIT_DIR"/TAG_EDITMSG printf '%s\n' "$message" >"$GIT_DIR"/TAG_EDITMSG
fi fi
grep -v '^#' <"$GIT_DIR"/TAG_EDITMSG | grep -v '^#' <"$GIT_DIR"/TAG_EDITMSG |