Merge branch 'jc/abbrev-guard'

diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index 4fcedda23dfcf0d25bdb5d9903671b03ddf3bb58..5cb7e70d54267b53ffb4b0f4c46875308d9de5a6 100755 (executable)
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -30,8 +30,8 @@ Initial setup:
 . "$TEST_DIRECTORY"/lib-rebase.sh
 
 test_cmp_rev () {
-       git describe --always --tags "$1" >expect.rev &&
-       git describe --always --tags "$2" >actual.rev &&
+       git rev-parse --verify "$1" >expect.rev &&
+       git rev-parse --verify "$2" >actual.rev &&
        test_cmp expect.rev actual.rev
 }