diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-08-22 18:52:26 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-08-22 18:52:27 (GMT) |
| commit | 9cd33bbc529bfa830c687d377433c46474d10e6a (patch) | |
| tree | 79268934569751906061421fcd5c46b751441c67 /builtin/diff.c | |
| parent | 8d35c114579fd870feb61f3746e1371634fd2163 (diff) | |
| parent | 28452655af988094792483a51d188c58137760cd (diff) | |
| download | git-9cd33bbc529bfa830c687d377433c46474d10e6a.zip git-9cd33bbc529bfa830c687d377433c46474d10e6a.tar.gz git-9cd33bbc529bfa830c687d377433c46474d10e6a.tar.bz2 | |
Merge branch 'tr/void-diff-setup-done'
Remove unnecessary code.
* tr/void-diff-setup-done:
diff_setup_done(): return void
Diffstat (limited to 'builtin/diff.c')
| -rw-r--r-- | builtin/diff.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/builtin/diff.c b/builtin/diff.c index da8f6aa..ecfdd1b 100644 --- a/builtin/diff.c +++ b/builtin/diff.c @@ -298,8 +298,7 @@ int cmd_diff(int argc, const char **argv, const char *prefix) argc = setup_revisions(argc, argv, &rev, NULL); if (!rev.diffopt.output_format) { rev.diffopt.output_format = DIFF_FORMAT_PATCH; - if (diff_setup_done(&rev.diffopt) < 0) - die(_("diff_setup_done failed")); + diff_setup_done(&rev.diffopt); } DIFF_OPT_SET(&rev.diffopt, RECURSIVE); |