Merge branch 'jc/rerere'

diff --git a/t/t5701-clone-local.sh b/t/t5701-clone-local.sh
index 3559d179647035a6ad8783aabfbecb8edcd4c254..8b4c356cd21846025d84a434077bfdc8ee2bab57 100755 (executable)
--- a/t/t5701-clone-local.sh
+++ b/t/t5701-clone-local.sh
@@ -119,7 +119,9 @@ test_expect_success 'bundle clone with nonexistent HEAD' '
 test_expect_success 'clone empty repository' '
        cd "$D" &&
        mkdir empty &&
-       (cd empty && git init) &&
+       (cd empty &&
+        git init &&
+        git config receive.denyCurrentBranch warn) &&
        git clone empty empty-clone &&
        test_tick &&
        (cd empty-clone
@@ -132,4 +134,14 @@ test_expect_success 'clone empty repository' '
         test $actual = $expected)
 '
 
+test_expect_success 'clone empty repository, and then push should not segfault.' '
+       cd "$D" &&
+       rm -fr empty/ empty-clone/ &&
+       mkdir empty &&
+       (cd empty && git init) &&
+       git clone empty empty-clone &&
+       (cd empty-clone &&
+       test_must_fail git push)
+'
+
 test_done