diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-01-24 21:11:27 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-01-24 21:11:27 +0300 |
commit | 7ecee3314fdafd8015fd14bfb76ae4b601acc25e (patch) | |
tree | d4bed4779913c685bff1b58ba7eaa79a0b7b8641 /t | |
parent | 76c9c0db3d0b9d17ca4dcbb0f9b6678f78a2492c (diff) |
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>
Diffstat (limited to 't')
-rwxr-xr-x | t/t5524-pull-msg.sh | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/t/t5524-pull-msg.sh b/t/t5524-pull-msg.sh new file mode 100755 index 0000000000..8cccecc2fc --- /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 |