Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'jk/maint-reflog-bottom' into maint
* jk/maint-reflog-bottom: reflogs: clear flags properly in corner case
- Loading branch information
Showing
3 changed files
with
37 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
#!/bin/sh | ||
|
||
test_description='reflog walk shows repeated commits again' | ||
. ./test-lib.sh | ||
|
||
test_expect_success 'setup commits' ' | ||
test_tick && | ||
echo content >file && git add file && git commit -m one && | ||
git tag one && | ||
echo content >>file && git add file && git commit -m two && | ||
git tag two | ||
' | ||
|
||
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} two: updating HEAD | ||
topic@{1} one: updating HEAD | ||
topic@{2} two: updating HEAD | ||
topic@{3} one: updating HEAD | ||
topic@{4} branch: Created from HEAD | ||
EOF | ||
git log -g --format="%gd %gs" topic >actual && | ||
test_cmp expect actual | ||
' | ||
|
||
test_done |