f5d79bf7dd
Refactor a few more tests to use the new "--append" option to "test_commit". I added it for use in the mailmap tests, but this demonstrates how useful it is in general. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
32 lines
694 B
Bash
Executable File
32 lines
694 B
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='reflog walk shows repeated commits again'
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'setup commits' '
|
|
test_commit one file content &&
|
|
test_commit --append two file content
|
|
'
|
|
|
|
test_expect_success 'setup reflog with alternating commits' '
|
|
git checkout -b topic &&
|
|
git reset one &&
|
|
git reset two &&
|
|
git reset one &&
|
|
git reset two
|
|
'
|
|
|
|
test_expect_success 'reflog shows all entries' '
|
|
cat >expect <<-\EOF &&
|
|
topic@{0} reset: moving to two
|
|
topic@{1} reset: moving to one
|
|
topic@{2} reset: moving to two
|
|
topic@{3} reset: moving to one
|
|
topic@{4} branch: Created from HEAD
|
|
EOF
|
|
git log -g --format="%gd %gs" topic >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_done
|