diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-11-21 22:57:48 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-21 22:57:48 +0900 |
| commit | 3f0c460b45b003d3433d3e6f9f471025bb04f63b (patch) | |
| tree | bac839ad820cd386bb2c91c306ce879666fce45a /builtin/merge-recursive.c | |
| parent | Merge branch 'jt/non-blob-lazy-fetch' into maint (diff) | |
| parent | split-index: BUG() when cache entry refers to non-existing shared entry (diff) | |
| download | tgif-3f0c460b45b003d3433d3e6f9f471025bb04f63b.tar.xz | |
Merge branch 'sg/split-index-racefix' into maint
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
Diffstat (limited to 'builtin/merge-recursive.c')
0 files changed, 0 insertions, 0 deletions