diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-09-11 11:23:45 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-09-11 11:23:54 -0700 |
commit | 1c88a6d17492b197b9b3298cbc34efa804928302 (patch) | |
tree | b0370caa6322930a13898673c5a559aef20c8791 /diff-no-index.c | |
parent | 31190841049549b5daaffeb0b9888ebed0bbfc8a (diff) | |
parent | e09e4024a070e666ed40b66442e8151b91d623e4 (diff) | |
download | git-1c88a6d17492b197b9b3298cbc34efa804928302.tar.gz |
Sync with 1.7.11.6
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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); |