Merge branch 'tr/void-diff-setup-done'

diff --git a/revision.c b/revision.c
index 9e8f47a25d8def94cbf2a8389039e4d3d670cd06..57eb0c0e13a216a58b99f5049a53cd7e1be26f1a 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -1861,8 +1861,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);