summaryrefslogtreecommitdiff
path: root/builtin/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-09-11 17:53:40 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-09-11 17:53:40 (GMT)
commit738c2187604756fea3901554a49f9137e02ed0ef (patch)
treeac786621832f1ac568761e96989ca984a836530e /builtin/diff.c
parent3f835949e9b800619136f2511e84000c95916d6e (diff)
parent28452655af988094792483a51d188c58137760cd (diff)
downloadgit-738c2187604756fea3901554a49f9137e02ed0ef.zip
git-738c2187604756fea3901554a49f9137e02ed0ef.tar.gz
git-738c2187604756fea3901554a49f9137e02ed0ef.tar.bz2
Merge branch 'tr/void-diff-setup-done' into maint-1.7.11
* tr/void-diff-setup-done: diff_setup_done(): return void
Diffstat (limited to 'builtin/diff.c')
-rw-r--r--builtin/diff.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/builtin/diff.c b/builtin/diff.c
index bf72298..9650be2 100644
--- a/builtin/diff.c
+++ b/builtin/diff.c
@@ -302,8 +302,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);