mirror of
https://github.com/git/git.git
synced 2024-11-05 00:37:55 +01:00
7ecee3314f
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>
35 lines
571 B
Bash
Executable file
35 lines
571 B
Bash
Executable file
#!/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
|