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>
This commit is contained in:
Junio C Hamano 2010-01-24 10:11:27 -08:00
Родитель 76c9c0db3d
Коммит 7ecee3314f
2 изменённых файлов: 36 добавлений и 1 удалений

Просмотреть файл

@ -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"

35
t/t5524-pull-msg.sh Executable file
Просмотреть файл

@ -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