2010-01-24 19:11:27 +01:00
|
|
|
#!/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 &&
|
2015-05-18 15:39:56 +02:00
|
|
|
echo "second" >afile &&
|
|
|
|
git add afile &&
|
|
|
|
git commit -m "second commit" &&
|
2010-01-24 19:11:27 +01:00
|
|
|
echo "original $dollar" >afile &&
|
|
|
|
git add afile &&
|
|
|
|
git commit -m "do not clobber $dollar signs"
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success pull '
|
|
|
|
(
|
|
|
|
cd cloned &&
|
2021-07-22 07:04:48 +02:00
|
|
|
git pull --no-rebase --log &&
|
2010-01-24 19:11:27 +01:00
|
|
|
git log -2 &&
|
|
|
|
git cat-file commit HEAD >result &&
|
|
|
|
grep Dollar result
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2015-05-18 15:39:56 +02:00
|
|
|
test_expect_success '--log=1 limits shortlog length' '
|
|
|
|
(
|
|
|
|
cd cloned &&
|
|
|
|
git reset --hard HEAD^ &&
|
|
|
|
test "$(cat afile)" = original &&
|
|
|
|
test "$(cat bfile)" = added &&
|
2021-07-22 07:04:48 +02:00
|
|
|
git pull --no-rebase --log=1 &&
|
2015-05-18 15:39:56 +02:00
|
|
|
git log -3 &&
|
|
|
|
git cat-file commit HEAD >result &&
|
|
|
|
grep Dollar result &&
|
|
|
|
! grep "second commit" result
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2010-01-24 19:11:27 +01:00
|
|
|
test_done
|