3 test_description
='git pull message generation'
5 TEST_PASSES_SANITIZE_LEAK
=true
10 test_expect_success setup
'
11 test_commit initial afile original &&
18 git commit -m "add bfile"
20 test_tick && test_tick &&
21 echo "second" >afile &&
23 git commit -m "second commit" &&
24 echo "original $dollar" >afile &&
26 git commit -m "do not clobber $dollar signs"
29 test_expect_success pull
'
32 git pull --no-rebase --log &&
34 git cat-file commit HEAD >result &&
39 test_expect_success
'--log=1 limits shortlog length' '
42 git reset --hard HEAD^ &&
43 test "$(cat afile)" = original &&
44 test "$(cat bfile)" = added &&
45 git pull --no-rebase --log=1 &&
47 git cat-file commit HEAD >result &&
49 ! grep "second commit" result