summaryrefslogtreecommitdiff
path: root/notes-merge.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-08-22 11:52:26 -0700
committerJunio C Hamano <gitster@pobox.com>2012-08-22 11:52:27 -0700
commit9cd33bbc529bfa830c687d377433c46474d10e6a (patch)
tree79268934569751906061421fcd5c46b751441c67 /notes-merge.c
parent8d35c114579fd870feb61f3746e1371634fd2163 (diff)
parent28452655af988094792483a51d188c58137760cd (diff)
downloadgit-9cd33bbc529bfa830c687d377433c46474d10e6a.tar.gz
Merge branch 'tr/void-diff-setup-done'
Remove unnecessary code. * tr/void-diff-setup-done: diff_setup_done(): return void
Diffstat (limited to 'notes-merge.c')
-rw-r--r--notes-merge.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/notes-merge.c b/notes-merge.c
index 29c6411fc6..0f67bd3f96 100644
--- a/notes-merge.c
+++ b/notes-merge.c
@@ -126,8 +126,7 @@ static struct notes_merge_pair *diff_tree_remote(struct notes_merge_options *o,
diff_setup(&opt);
DIFF_OPT_SET(&opt, RECURSIVE);
opt.output_format = DIFF_FORMAT_NO_OUTPUT;
- if (diff_setup_done(&opt) < 0)
- die("diff_setup_done failed");
+ diff_setup_done(&opt);
diff_tree_sha1(base, remote, "", &opt);
diffcore_std(&opt);
@@ -190,8 +189,7 @@ static void diff_tree_local(struct notes_merge_options *o,
diff_setup(&opt);
DIFF_OPT_SET(&opt, RECURSIVE);
opt.output_format = DIFF_FORMAT_NO_OUTPUT;
- if (diff_setup_done(&opt) < 0)
- die("diff_setup_done failed");
+ diff_setup_done(&opt);
diff_tree_sha1(base, local, "", &opt);
diffcore_std(&opt);