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 /revision.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 'revision.c')
| -rw-r--r-- | revision.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/revision.c b/revision.c index 04c7de87d0..442a945233 100644 --- a/revision.c +++ b/revision.c @@ -1863,8 +1863,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s if (revs->combine_merges) revs->ignore_merges = 0; revs->diffopt.abbrev = revs->abbrev; - if (diff_setup_done(&revs->diffopt) < 0) - die("diff_setup_done failed"); + diff_setup_done(&revs->diffopt); compile_grep_patterns(&revs->grep_filter); |