From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 26 Oct 2018 05:22:10 +0000 (+0900)
Subject: Merge branch 'sg/split-index-racefix'
X-Git-Tag: v2.20.0-rc0~142
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7a43ab6fb25924ca018073ef7ef46e16b3156bd0;p=thirdparty%2Fgit.git

Merge branch 'sg/split-index-racefix'

The codepath to support the experimental split-index mode had
remaining "racily clean" issues fixed.

* sg/split-index-racefix:
  split-index: BUG() when cache entry refers to non-existing shared entry
  split-index: smudge and add racily clean cache entries to split index
  split-index: don't compare cached data of entries already marked for split index
  split-index: count the number of deleted entries
  t1700-split-index: date back files to avoid racy situations
  split-index: add tests to demonstrate the racy split index problem
  t1700-split-index: document why FSMONITOR is disabled in this test script
---

7a43ab6fb25924ca018073ef7ef46e16b3156bd0
diff --cc t/t1700-split-index.sh
index 3e618cad12,ae74d2664a..2ac47aa0e4
--- a/t/t1700-split-index.sh
+++ b/t/t1700-split-index.sh
@@@ -6,13 -6,18 +6,20 @@@ test_description='split index mode test
  
  # We need total control of index splitting here
  sane_unset GIT_TEST_SPLIT_INDEX
 -# A couple of tests expect the index to have a specific checksum,
 -# but the presence of the optional FSMN extension would interfere
 -# with those checks, so disable it in this test script.
 -sane_unset GIT_FSMONITOR_TEST
 +
 +# Testing a hard coded SHA against an index with an extension
 +# that can vary from run to run is problematic so we disable
 +# those extensions.
 +sane_unset GIT_TEST_FSMONITOR
 +sane_unset GIT_TEST_INDEX_THREADS
  
+ # Create a file named as $1 with content read from stdin.
+ # Set the file's mtime to a few seconds in the past to avoid racy situations.
+ create_non_racy_file () {
+ 	cat >"$1" &&
+ 	test-tool chmtime =-5 "$1"
+ }
+ 
  test_expect_success 'enable split index' '
  	git config splitIndex.maxPercentChange 100 &&
  	git update-index --split-index &&