]> git.ipfire.org Git - thirdparty/git.git/blob - t/t5524-pull-msg.sh
Merge remote branch 'ko/master' into jc/read-tree-cache-tree-fix
[thirdparty/git.git] / t / t5524-pull-msg.sh
1 #!/bin/sh
2
3 test_description='git pull message generation'
4
5 . ./test-lib.sh
6
7 dollar='$Dollar'
8
9 test_expect_success setup '
10 test_commit initial afile original &&
11 git clone . cloned &&
12 (
13 cd cloned &&
14 echo added >bfile &&
15 git add bfile &&
16 test_tick &&
17 git commit -m "add bfile"
18 ) &&
19 test_tick && test_tick &&
20 echo "original $dollar" >afile &&
21 git add afile &&
22 git commit -m "do not clobber $dollar signs"
23 '
24
25 test_expect_success pull '
26 (
27 cd cloned &&
28 git pull --log &&
29 git log -2 &&
30 git cat-file commit HEAD >result &&
31 grep Dollar result
32 )
33 '
34
35 test_done