Sync with 2.17.2

diff --git a/t/t1700-split-index.sh b/t/t1700-split-index.sh
index e4f4c4df4ee3686e5ad1621134a827b941b38bca..1e81b33b2e3a23a135c9b9440787a6e0c0deaa22 100755 (executable)
--- a/t/t1700-split-index.sh
+++ b/t/t1700-split-index.sh
@@ -426,7 +426,7 @@ test_expect_success 'writing split index with null sha1 does not write cache tre
        git commit -m "commit" &&
        {
                git ls-tree HEAD &&
-               printf "160000 commit $_z40\\tbroken\\n"
+               printf "160000 commit $ZERO_OID\\tbroken\\n"
        } >broken-tree &&
        echo "add broken entry" >msg &&