Merge branch 'ds/omit-trailing-hash-in-index' into ab/cache-api-cleanup-users

* ds/omit-trailing-hash-in-index:
  t1600: fix racy index.skipHash test

Author: gitster

t/t1600-index.sh

@@ -88,6 +88,7 @@ test_expect_success 'index.skipHash config option' '
 	git -c protocol.file.allow=always submodule add ./ sub &&
 	git config index.skipHash false &&
 	git -C sub config index.skipHash true &&
+	rm -f .git/modules/sub/index &&
 	>sub/file &&
 	git -C sub add a &&
 	test_trailing_hash .git/modules/sub/index >hash &&