summaryrefslogtreecommitdiff
path: root/diff-no-index.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 /diff-no-index.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 'diff-no-index.c')
-rw-r--r--diff-no-index.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/diff-no-index.c b/diff-no-index.c
index 7d805a06af..b34b5aa7df 100644
--- a/diff-no-index.c
+++ b/diff-no-index.c
@@ -258,8 +258,7 @@ void diff_no_index(struct rev_info *revs,
DIFF_OPT_SET(&revs->diffopt, NO_INDEX);
revs->max_count = -2;
- if (diff_setup_done(&revs->diffopt) < 0)
- die("diff_setup_done failed");
+ diff_setup_done(&revs->diffopt);
setup_diff_pager(&revs->diffopt);
DIFF_OPT_SET(&revs->diffopt, EXIT_WITH_STATUS);