From: Junio C Hamano Date: Wed, 9 Aug 2006 19:45:27 +0000 (-0700) Subject: check return value from diff_setup_done() X-Git-Tag: v1.4.2-rc4~3 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=72ee96c0f1861fcdb9eaf39e78d86888437a27a9;p=git.git check return value from diff_setup_done() Signed-off-by: Junio C Hamano --- diff --git a/builtin-diff.c b/builtin-diff.c index 107585510..dd9886c6e 100644 --- a/builtin-diff.c +++ b/builtin-diff.c @@ -253,7 +253,8 @@ 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; - diff_setup_done(&rev.diffopt); + if (diff_setup_done(&rev.diffopt) < 0) + die("diff_setup_done failed"); } /* Do we have --cached and not have a pending object, then diff --git a/revision.c b/revision.c index a58257ad8..5a91d06b9 100644 --- a/revision.c +++ b/revision.c @@ -936,7 +936,8 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch revs->diffopt.output_format = DIFF_FORMAT_PATCH; } revs->diffopt.abbrev = revs->abbrev; - diff_setup_done(&revs->diffopt); + if (diff_setup_done(&revs->diffopt) < 0) + die("diff_setup_done failed"); return left; }