Merge branch 'rs/maint-config-use-labs'

diff --git a/t/t1503-rev-parse-verify.sh b/t/t1503-rev-parse-verify.sh
index 813cc1b3e29ec840deb63ad9c3c1dffd2187cdc5..823fe1d79924b68950a59ffde902b16db29205b6 100755 (executable)
--- a/t/t1503-rev-parse-verify.sh
+++ b/t/t1503-rev-parse-verify.sh
@@ -72,15 +72,42 @@ test_expect_success 'fails with any bad rev or many good revs' '
 
 test_expect_success 'fails silently when using -q' '
        test_must_fail git rev-parse --verify --quiet 2>error &&
-       test -z "$(cat error)" &&
+       test_must_be_empty error &&
        test_must_fail git rev-parse -q --verify foo 2>error &&
-       test -z "$(cat error)" &&
+       test_must_be_empty error &&
        test_must_fail git rev-parse --verify -q HEAD bar 2>error &&
-       test -z "$(cat error)" &&
+       test_must_be_empty error &&
        test_must_fail git rev-parse --quiet --verify baz HEAD 2>error &&
-       test -z "$(cat error)" &&
+       test_must_be_empty error &&
        test_must_fail git rev-parse -q --verify $HASH2 HEAD 2>error &&
-       test -z "$(cat error)"
+       test_must_be_empty error
+'
+
+test_expect_success 'fails silently when using -q with deleted reflogs' '
+       ref=$(git rev-parse HEAD) &&
+       : >.git/logs/refs/test &&
+       git update-ref -m "message for refs/test" refs/test "$ref" &&
+       git reflog delete --updateref --rewrite refs/test@{0} &&
+       test_must_fail git rev-parse -q --verify refs/test@{0} >error 2>&1 &&
+       test_must_be_empty error
+'
+
+test_expect_success 'fails silently when using -q with not enough reflogs' '
+       ref=$(git rev-parse HEAD) &&
+       : >.git/logs/refs/test2 &&
+       git update-ref -m "message for refs/test2" refs/test2 "$ref" &&
+       test_must_fail git rev-parse -q --verify refs/test2@{999} >error 2>&1 &&
+       test_must_be_empty error
+'
+
+test_expect_success 'succeeds silently with -q and reflogs that do not go far back enough in time' '
+       ref=$(git rev-parse HEAD) &&
+       : >.git/logs/refs/test3 &&
+       git update-ref -m "message for refs/test3" refs/test3 "$ref" &&
+       git rev-parse -q --verify refs/test3@{1.year.ago} >actual 2>error &&
+       test_must_be_empty error &&
+       echo "$ref" >expect &&
+       test_cmp expect actual
 '
 
 test_expect_success 'no stdout output on error' '