diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-08-09 12:45:27 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-08-09 12:45:27 -0700 |
| commit | 72ee96c0f1861fcdb9eaf39e78d86888437a27a9 (patch) | |
| tree | 4f670c1132c867b7887a070dc450e63ace2fd03e | |
| parent | Fix tutorial-2.html (diff) | |
| download | tgif-72ee96c0f1861fcdb9eaf39e78d86888437a27a9.tar.xz | |
check return value from diff_setup_done()
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rw-r--r-- | builtin-diff.c | 3 | ||||
| -rw-r--r-- | revision.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/builtin-diff.c b/builtin-diff.c index 1075855102..dd9886c6e8 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 a58257ad80..5a91d06b98 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; } |