X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=unpack-trees.c;h=8cf0da317d8afe4bfe3cae7051e3a385d44cf7ef;hb=48c250a121a425a1860226b6a7061aecfbab5246;hp=e8f03f51541472ead12d55672ba4422f97a3c113;hpb=c4818faf81d32d940c58ab209f83b6049b33ecbb;p=git.git diff --git a/unpack-trees.c b/unpack-trees.c index e8f03f515..8cf0da317 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) {