Merge branch 'jc/receive-deny-current-branch-fix' into maint

diff --git a/t/t5314-pack-cycle-detection.sh b/t/t5314-pack-cycle-detection.sh
index f31995d3d28d9fcd590c91aed7686aef87e332af..e525466de09856fe2c99345d34b7776f451b1c2a 100755 (executable)
--- a/t/t5314-pack-cycle-detection.sh
+++ b/t/t5314-pack-cycle-detection.sh
@@ -98,9 +98,8 @@ test_expect_success 'repack' '
        # We first want to check that we do not have any internal errors,
        # and also that we do not hit the last-ditch cycle-breaking code
        # in write_object(), which will issue a warning to stderr.
-       >expect &&
        git repack -ad 2>stderr &&
-       test_cmp expect stderr &&
+       test_must_be_empty stderr &&
 
        # And then double-check that the resulting pack is usable (i.e.,
        # we did not fail to notice any cycles). We know we are accessing