diff options
| author | Thomas Rast <trast@student.ethz.ch> | 2012-08-03 14:16:24 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-08-03 12:11:07 -0700 |
| commit | 28452655af988094792483a51d188c58137760cd (patch) | |
| tree | 17021a34d32b9963d8612040a75b15b4e501399a /revision.c | |
| parent | d0f1ea6003d97e63110fa7d50bb07f546a909b6e (diff) | |
| download | git-28452655af988094792483a51d188c58137760cd.tar.gz | |
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 'revision.c')
| -rw-r--r-- | revision.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/revision.c b/revision.c index 18be62b316..86d17c6d7a 100644 --- a/revision.c +++ b/revision.c @@ -1833,8 +1833,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s if (revs->combine_merges) revs->ignore_merges = 0; revs->diffopt.abbrev = revs->abbrev; - if (diff_setup_done(&revs->diffopt) < 0) - die("diff_setup_done failed"); + diff_setup_done(&revs->diffopt); compile_grep_patterns(&revs->grep_filter); |