diff options
author | Thomas Gummerer <t.gummerer@gmail.com> | 2015-03-20 22:43:14 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-03-20 14:56:30 -0700 |
commit | 03f15a79a9006d819a25fe04199f9302ad4aaea0 (patch) | |
tree | 7473203f72e3921419e278cbfdb70ad633c7bed9 /shallow.c | |
parent | 9874fca7122563e28d699a911404fc49d2a24f1c (diff) | |
download | git-tg/fix-check-order-with-split-index.tar.gz |
read-cache: fix reading of split indextg/fix-check-order-with-split-index
The split index extension uses ewah bitmaps to mark index entries as
deleted, instead of removing them from the index directly. This can
result in an on-disk index, in which entries of stage #0 and higher
stages appear, which are removed later when the index bases are merged.
15999d0 read_index_from(): catch out of order entries when reading an
index file introduces a check which checks if the entries are in order
after each index entry is read in do_read_index. This check may however
fail when a split index is read.
Fix this by moving checking the index after we know there is no split
index or after the split index bases are successfully merged instead.
Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'shallow.c')
0 files changed, 0 insertions, 0 deletions