diff options
| author | Pieter de Bie <pdebie@ai.rug.nl> | 2008-08-10 01:33:29 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-10 23:15:44 -0700 |
| commit | 38881a9066fcb3ce6e0438e6d7b20cce22ece411 (patch) | |
| tree | 92174d112c99b33c87bd1d9b60be709fc8210d66 /t/t1410-reflog.sh | |
| parent | 18a2197e6d1be4b2a4a4b10cac34215fac5be5f9 (diff) | |
| download | git-38881a9066fcb3ce6e0438e6d7b20cce22ece411.tar.gz | |
reflog test: add more tests for 'reflog delete'
This adds more tests for 'reflog delete' and marks it as
broken, as currently a call to 'git reflog delete HEAD@{1}'
deletes entries in the currently checked out branch's log,
not the HEAD log.
Noticed by John Wiegley
Signed-off-by: Pieter de Bie <pdebie@ai.rug.nl>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t1410-reflog.sh')
| -rwxr-xr-x | t/t1410-reflog.sh | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/t/t1410-reflog.sh b/t/t1410-reflog.sh index 73f830db23..3b9860ea2e 100755 --- a/t/t1410-reflog.sh +++ b/t/t1410-reflog.sh @@ -175,7 +175,7 @@ test_expect_success 'recover and check' ' ' -test_expect_success 'delete' ' +test_expect_failure 'delete' ' echo 1 > C && test_tick && git commit -m rat C && @@ -188,16 +188,30 @@ test_expect_success 'delete' ' test_tick && git commit -m tiger C && - test 5 = $(git reflog | wc -l) && + HEAD_entry_count=$(git reflog | wc -l) + master_entry_count=$(git reflog show master | wc -l) + + test $HEAD_entry_count = 5 && + test $master_entry_count = 5 && + git reflog delete master@{1} && git reflog show master > output && - test 4 = $(wc -l < output) && + test $(($master_entry_count - 1)) = $(wc -l < output) && + test $HEAD_entry_count = $(git reflog | wc -l) && ! grep ox < output && + master_entry_count=$(wc -l < output) + + git reflog delete HEAD@{1} && + test $(($HEAD_entry_count -1)) = $(git reflog | wc -l) && + test $master_entry_count = $(git reflog show master | wc -l) && + + HEAD_entry_count=$(git reflog | wc -l) + git reflog delete master@{07.04.2005.15:15:00.-0700} && git reflog show master > output && - test 3 = $(wc -l < output) && + test $(($master_entry_count - 1)) = $(wc -l < output) && ! grep dragon < output ' |