mergetool: Skip autoresolved paths
[git/mjg.git] / t / t5524-pull-msg.sh
blob8cccecc2fcce0c1a9b1f90a30608ab9e9b662eae
1 #!/bin/sh
3 test_description='git pull message generation'
5 . ./test-lib.sh
7 dollar='$Dollar'
9 test_expect_success setup '
10 test_commit initial afile original &&
11 git clone . cloned &&
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"
25 test_expect_success pull '
27 cd cloned &&
28 git pull --log &&
29 git log -2 &&
30 git cat-file commit HEAD >result &&
31 grep Dollar result
35 test_done