aboutsummaryrefslogtreecommitdiffstats
path: root/builtin/diff-tree.c
diff options
context:
space:
mode:
Diffstat (limited to 'builtin/diff-tree.c')
-rw-r--r--builtin/diff-tree.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/builtin/diff-tree.c b/builtin/diff-tree.c
index af51cd29c6..995225ef5f 100644
--- a/builtin/diff-tree.c
+++ b/builtin/diff-tree.c
@@ -232,10 +232,5 @@ int cmd_diff_tree(int argc, const char **argv, const char *prefix)
diff_free(&opt->diffopt);
}
- if (opt->remerge_diff) {
- tmp_objdir_destroy(opt->remerge_objdir);
- opt->remerge_objdir = NULL;
- }
-
- return diff_result_code(&opt->diffopt);
+ return diff_result_code(opt);
}