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

Remove unnecessary code.

* tr/void-diff-setup-done:
  diff_setup_done(): return void
This commit is contained in:
Junio C Hamano
2012-08-22 11:52:26 -07:00
13 changed files with 16 additions and 32 deletions

View File

@ -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);