From: Felipe Contreras Date: Thu, 30 May 2013 13:56:20 GMT Subject: [PATCH 3/4] unpack-trees: trivial cleanup Message-ID: <1369922181-31016-4-git-send-email-felipe.contreras@gmail.com> In-Reply-To: <1369922181-31016-1-git-send-email-felipe.contreras@gmail.com> dfc has not been initialized at this point. Signed-off-by: Felipe Contreras --- unpack-trees.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/unpack-trees.c b/unpack-trees.c index ede4299..36f4ff7 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -1040,8 +1040,7 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options if (!o->skip_sparse_checkout) mark_new_skip_worktree(o->el, o->src_index, 0, CE_NEW_SKIP_WORKTREE); - if (!dfc) - dfc = xcalloc(1, cache_entry_size(0)); + dfc = xcalloc(1, cache_entry_size(0)); o->df_conflict_entry = dfc; if (len) { -- 1.8.3.rc3.312.g47657de