X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=unpack-trees.c;h=85045fd03fd7ab2a2ad8daf5ec584e010372673b;hb=a214afd25b7077fd4efebb90cf65d5403ce82dc0;hp=490cd5f6f4779cbff68405722b98e522cbeb3cde;hpb=e391fdfc69bd64e11f31416c38ab491a04c0ffa0;p=git.git diff --git a/unpack-trees.c b/unpack-trees.c index 490cd5f6f..85045fd03 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -279,9 +279,11 @@ static void add_same_unmerged(struct cache_entry *ce, static int unpack_index_entry(struct cache_entry *ce, struct unpack_trees_options *o) { - struct cache_entry *src[5] = { ce, NULL, }; + struct cache_entry *src[5] = { NULL }; int ret; + src[0] = ce; + mark_ce_used(ce, o); if (ce_stage(ce)) { if (o->skip_unmerged) {