diff options
| author | Thomas Rast <trast@student.ethz.ch> | 2012-08-03 12:16:24 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-08-03 19:11:07 (GMT) |
| commit | 28452655af988094792483a51d188c58137760cd (patch) | |
| tree | 17021a34d32b9963d8612040a75b15b4e501399a /diff-no-index.c | |
| parent | d0f1ea6003d97e63110fa7d50bb07f546a909b6e (diff) | |
| download | git-28452655af988094792483a51d188c58137760cd.zip git-28452655af988094792483a51d188c58137760cd.tar.gz git-28452655af988094792483a51d188c58137760cd.tar.bz2 | |
diff_setup_done(): return void
diff_setup_done() has historically returned an error code, but lost
the last nonzero return in 943d5b7 (allow diff.renamelimit to be set
regardless of -M/-C, 2006-08-09). The callers were in a pretty
confused state: some actually checked for the return code, and some
did not.
Let it return void, and patch all callers to take this into account.
This conveniently also gets rid of a handful of different(!) error
messages that could never be triggered anyway.
Note that the function can still die().
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff-no-index.c')
| -rw-r--r-- | diff-no-index.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/diff-no-index.c b/diff-no-index.c index 3a36144..b245ca8 100644 --- a/diff-no-index.c +++ b/diff-no-index.c @@ -257,8 +257,7 @@ void diff_no_index(struct rev_info *revs, DIFF_OPT_SET(&revs->diffopt, NO_INDEX); revs->max_count = -2; - if (diff_setup_done(&revs->diffopt) < 0) - die("diff_setup_done failed"); + diff_setup_done(&revs->diffopt); if (queue_diff(&revs->diffopt, revs->diffopt.pathspec.raw[0], revs->diffopt.pathspec.raw[1])) |