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>
This commit is contained in:
		 Jeff King
					Jeff King
				
			
				
					committed by
					
						 Junio C Hamano
						Junio C Hamano
					
				
			
			
				
	
			
			
			 Junio C Hamano
						Junio C Hamano
					
				
			
						parent
						
							816366e23d
						
					
				
				
					commit
					a23bfaed7d
				
			| @ -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 ;; | ||||
|  | ||||
| @ -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 | ||||
|  | ||||
| @ -126,7 +126,7 @@ if [ "$annotate" ]; then | ||||
|           echo "#" ) > "$GIT_DIR"/TAG_EDITMSG | ||||
|         ${VISUAL:-${EDITOR:-vi}} "$GIT_DIR"/TAG_EDITMSG || exit | ||||
|     else | ||||
|         echo "$message" >"$GIT_DIR"/TAG_EDITMSG | ||||
|         printf '%s\n' "$message" >"$GIT_DIR"/TAG_EDITMSG | ||||
|     fi | ||||
|  | ||||
|     grep -v '^#' <"$GIT_DIR"/TAG_EDITMSG | | ||||
|  | ||||
		Reference in New Issue
	
	Block a user