summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-08-22 18:52:26 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-08-22 18:52:27 (GMT)
commit9cd33bbc529bfa830c687d377433c46474d10e6a (patch)
tree79268934569751906061421fcd5c46b751441c67 /merge-recursive.c
parent8d35c114579fd870feb61f3746e1371634fd2163 (diff)
parent28452655af988094792483a51d188c58137760cd (diff)
downloadgit-9cd33bbc529bfa830c687d377433c46474d10e6a.zip
git-9cd33bbc529bfa830c687d377433c46474d10e6a.tar.gz
git-9cd33bbc529bfa830c687d377433c46474d10e6a.tar.bz2
Merge branch 'tr/void-diff-setup-done'
Remove unnecessary code. * tr/void-diff-setup-done: diff_setup_done(): return void
Diffstat (limited to 'merge-recursive.c')
-rw-r--r--merge-recursive.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/merge-recursive.c b/merge-recursive.c
index 3b24d93..7866ca1 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -493,8 +493,7 @@ static struct string_list *get_renames(struct merge_options *o,
opts.rename_score = o->rename_score;
opts.show_rename_progress = o->show_rename_progress;
opts.output_format = DIFF_FORMAT_NO_OUTPUT;
- if (diff_setup_done(&opts) < 0)
- die(_("diff setup failed"));
+ diff_setup_done(&opts);
diff_tree_sha1(o_tree->object.sha1, tree->object.sha1, "", &opts);
diffcore_std(&opts);
if (opts.needed_rename_limit > o->needed_rename_limit)