undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/fsmonitor-sanity-fix'

Browse Source 
Remove an incorrect BUG() that should not trigger.

* jc/fsmonitor-sanity-fix:
  fsmonitor: do not compare bitmap size with size of split index
This commit is contained in:
Junio C Hamano 2019-12-01 09:04:39 -08:00
commit aec3b2e24f
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fsmonitor.c
View File

@ -55,7 +55,8 @@ int read_fsmonitor_extension(struct index_state *istate, const void *data,
} }
istate->fsmonitor_dirty = fsmonitor_dirty; istate->fsmonitor_dirty = fsmonitor_dirty;
if (istate->fsmonitor_dirty->bit_size > istate->cache_nr) if (!istate->split_index &&
istate->fsmonitor_dirty->bit_size > istate->cache_nr)
BUG("fsmonitor_dirty has more entries than the index (%"PRIuMAX" > %u)", BUG("fsmonitor_dirty has more entries than the index (%"PRIuMAX" > %u)",
(uintmax_t)istate->fsmonitor_dirty->bit_size, istate->cache_nr); (uintmax_t)istate->fsmonitor_dirty->bit_size, istate->cache_nr);
@ -83,7 +84,8 @@ void write_fsmonitor_extension(struct strbuf *sb, struct index_state *istate)
uint32_t ewah_size = 0; uint32_t ewah_size = 0;
int fixup = 0; int fixup = 0;
if (istate->fsmonitor_dirty->bit_size > istate->cache_nr) if (!istate->split_index &&
istate->fsmonitor_dirty->bit_size > istate->cache_nr)
BUG("fsmonitor_dirty has more entries than the index (%"PRIuMAX" > %u)", BUG("fsmonitor_dirty has more entries than the index (%"PRIuMAX" > %u)",
(uintmax_t)istate->fsmonitor_dirty->bit_size, istate->cache_nr); (uintmax_t)istate->fsmonitor_dirty->bit_size, istate->cache_nr);