Nguyễn Thái Ngọc Duy wrote: > --- a/cache-tree.c > +++ b/cache-tree.c > @@ -156,6 +156,8 @@ static int verify_cache(struct cache_entry **cache, > funny = 0; > for (i = 0; i < entries; i++) { > struct cache_entry *ce = cache[i]; > + if (ce->ce_flags & CE_REMOVE) > + continue; > if (ce_stage(ce) || (ce->ce_flags & CE_INTENT_TO_ADD)) { > if (10 < ++funny) { > fprintf(stderr, "...\n"); In other words, this teaches internal write-tree callers to ignore unmerged and intent-to-add entries marked with CE_REMOVE. Why? When does this come up? -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html