Merge branch 'ph/submodule-rebase'

diff --git a/t/t5405-send-pack-rewind.sh b/t/t5405-send-pack-rewind.sh
index 86abc6227105e27fdb9ad99e34193efb90a6242f..cb9aacc7bc62e2ecfdca0dc7f6071e5330fe09d0 100755 (executable)
--- a/t/t5405-send-pack-rewind.sh
+++ b/t/t5405-send-pack-rewind.sh
@@ -12,7 +12,7 @@ test_expect_success setup '
        mkdir another && (
                cd another &&
                git init &&
-               git fetch .. master:master
+               git fetch --update-head-ok .. master:master
        ) &&
 
        >file2 && git add file2 && test_tick &&