diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-09-11 10:53:40 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-11 10:53:40 -0700 |
| commit | 738c2187604756fea3901554a49f9137e02ed0ef (patch) | |
| tree | ac786621832f1ac568761e96989ca984a836530e /diff-no-index.c | |
| parent | 3f835949e9b800619136f2511e84000c95916d6e (diff) | |
| parent | 28452655af988094792483a51d188c58137760cd (diff) | |
| download | git-738c2187604756fea3901554a49f9137e02ed0ef.tar.gz | |
Merge branch 'tr/void-diff-setup-done' into maint-1.7.11
* tr/void-diff-setup-done:
diff_setup_done(): return void
Diffstat (limited to 'diff-no-index.c')
| -rw-r--r-- | diff-no-index.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/diff-no-index.c b/diff-no-index.c index 0b46a0f79f..74da659368 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); |