Merge branch 'nd/http-fetch-shallow-fix' into maint

diff --git a/t/t7501-commit.sh b/t/t7501-commit.sh
index 99ce36f5ef91ae91c0f2ebd02ae70c4cba4c937c..94eec83b37f38699af91b3808051515f267f3a5f 100755 (executable)
--- a/t/t7501-commit.sh
+++ b/t/t7501-commit.sh
@@ -53,10 +53,11 @@ test_expect_success PERL 'can use paths with --interactive' '
 '
 
 test_expect_success 'using invalid commit with -C' '
-       test_must_fail git commit -C bogus
+       test_must_fail git commit --allow-empty -C bogus
 '
 
 test_expect_success 'nothing to commit' '
+       git reset --hard &&
        test_must_fail git commit -m initial
 '