Merge branch 'es/add-doc-list-short-form-of-all-in-synopsis' into maint-2.43
[git.git] / t / t5524-pull-msg.sh
blob56716e29ddf1c3ded4cfae0443ee60ffe4eb0945
1 #!/bin/sh
3 test_description='git pull message generation'
5 TEST_PASSES_SANITIZE_LEAK=true
6 . ./test-lib.sh
8 dollar='$Dollar'
10 test_expect_success setup '
11 test_commit initial afile original &&
12 git clone . cloned &&
14 cd cloned &&
15 echo added >bfile &&
16 git add bfile &&
17 test_tick &&
18 git commit -m "add bfile"
19 ) &&
20 test_tick && test_tick &&
21 echo "second" >afile &&
22 git add afile &&
23 git commit -m "second commit" &&
24 echo "original $dollar" >afile &&
25 git add afile &&
26 git commit -m "do not clobber $dollar signs"
29 test_expect_success pull '
31 cd cloned &&
32 git pull --no-rebase --log &&
33 git log -2 &&
34 git cat-file commit HEAD >result &&
35 grep Dollar result
39 test_expect_success '--log=1 limits shortlog length' '
41 cd cloned &&
42 git reset --hard HEAD^ &&
43 test "$(cat afile)" = original &&
44 test "$(cat bfile)" = added &&
45 git pull --no-rebase --log=1 &&
46 git log -3 &&
47 git cat-file commit HEAD >result &&
48 grep Dollar result &&
49 ! grep "second commit" result
53 test_done