From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 18 Jan 2010 06:31:38 +0000 (-0800)
Subject: pull: Fix parsing of -X<option>
X-Git-Tag: v1.7.0-rc0~55^2~3
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=14e5d40ca4f4f118fe03cbe5302309170b46096d;p=git.git

pull: Fix parsing of -X<option>

As -X parameter can contain arbitrary $IFS characters, we need to
properly quote it from the shell while forming the command line.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/git-pull.sh b/git-pull.sh
index 6d961b699..fc3536bdf 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -68,10 +68,10 @@ do
 		1,-X)
 			usage ;;
 		*,-X)
-			xx="-X $2"
+			xx="-X $(git rev-parse --sq-quote "$2")"
 			shift ;;
 		*,*)
-			xx="$1" ;;
+			xx=$(git rev-parse --sq-quote "$1") ;;
 		esac
 		merge_args="$merge_args$xx "
 		;;
@@ -228,8 +228,15 @@ then
 fi
 
 merge_name=$(git fmt-merge-msg $log_arg <"$GIT_DIR/FETCH_HEAD") || exit
-test true = "$rebase" &&
-	exec git-rebase $diffstat $strategy_args $merge_args --onto $merge_head \
-	${oldremoteref:-$merge_head}
-exec git-merge $diffstat $no_commit $squash $no_ff $ff_only $log_arg $strategy_args $merge_args \
-	"$merge_name" HEAD $merge_head $verbosity
+case "$rebase" in
+true)
+	eval="git-rebase $diffstat $strategy_args $merge_args"
+	eval="$eval --onto $merge_head ${oldremoteref:-$merge_head}"
+	;;
+*)
+	eval="git-merge $diffstat $no_commit $squash $no_ff $ff_only"
+	eval="$eval  $log_arg $strategy_args $merge_args"
+	eval="$eval \"$merge_name\" HEAD $merge_head $verbosity"
+	;;
+esac
+eval "exec $eval"