From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 24 Jan 2010 18:11:27 +0000 (-0800)
Subject: pull: re-fix command line generation
X-Git-Tag: v1.7.0-rc0~8
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=7ecee3314fdafd8015fd14bfb76ae4b601acc25e;p=git.git

pull: re-fix command line generation

14e5d40 (pull: Fix parsing of -X<option>, 2010-01-17) forgot that
merge_name needs to stay as a single non-interpolated string.

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

diff --git a/git-pull.sh b/git-pull.sh
index 2de4c3aa7..38331a861 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -275,7 +275,7 @@ true)
 *)
 	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"
+	eval="$eval \"\$merge_name\" HEAD $merge_head $verbosity"
 	;;
 esac
 eval "exec $eval"
diff --git a/t/t5524-pull-msg.sh b/t/t5524-pull-msg.sh
new file mode 100755
index 000000000..8cccecc2f
--- /dev/null
+++ b/t/t5524-pull-msg.sh
@@ -0,0 +1,35 @@
+#!/bin/sh
+
+test_description='git pull message generation'
+
+. ./test-lib.sh
+
+dollar='$Dollar'
+
+test_expect_success setup '
+	test_commit initial afile original &&
+	git clone . cloned &&
+	(
+		cd cloned &&
+		echo added >bfile &&
+		git add bfile &&
+		test_tick &&
+		git commit -m "add bfile"
+	) &&
+	test_tick && test_tick &&
+	echo "original $dollar" >afile &&
+	git add afile &&
+	git commit -m "do not clobber $dollar signs"
+'
+
+test_expect_success pull '
+(
+	cd cloned &&
+	git pull --log &&
+	git log -2 &&
+	git cat-file commit HEAD >result &&
+	grep Dollar result
+)
+'
+
+test_done