[PATCH] pull: re-fix command line generation
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:48:05
Subsystem:
the rest · Maintainer:
Linus Torvalds
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 <redacted> --- * Just in case somebody is on 'master' and uses "pull --log"... git-pull.sh | 2 +- t/t5524-pull-msg.sh | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletions(-) create mode 100755 t/t5524-pull-msg.sh
diff --git a/git-pull.sh b/git-pull.sh
index 2de4c3a..38331a8 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 0000000..8cccecc
--- /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
--
1.6.6.1.557.g77031