Merge branch 'uk/merge-subtree-doc-update' into maint

diff --git a/t/t1700-split-index.sh b/t/t1700-split-index.sh
index ae74d2664a4cb490028ba88ca97f07957629ba9a..f053bf83eb9f716c3dc99a3bdf1a8e3b49802163 100755 (executable)
--- a/t/t1700-split-index.sh
+++ b/t/t1700-split-index.sh
@@ -67,7 +67,7 @@ test_expect_success 'disable split index' '
        EOF
        test_cmp ls-files.expect ls-files.actual &&
 
-       BASE=$(test-tool dump-split-index .git/index | grep "^own" | sed "s/own/base/") &&
+       BASE=$(test-tool dump-split-index .git/index | sed -n "s/^own/base/p") &&
        test-tool dump-split-index .git/index | sed "/^own/d" >actual &&
        cat >expect <<-EOF &&
        not a split index