]> git.ipfire.org Git - thirdparty/git.git/commit - notes-merge.c
diff_setup_done(): return void
authorThomas Rast <trast@student.ethz.ch>
Fri, 3 Aug 2012 12:16:24 +0000 (14:16 +0200)
committerJunio C Hamano <gitster@pobox.com>
Fri, 3 Aug 2012 19:11:07 +0000 (12:11 -0700)
commit28452655af988094792483a51d188c58137760cd
tree17021a34d32b9963d8612040a75b15b4e501399a
parentd0f1ea6003d97e63110fa7d50bb07f546a909b6e
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>
13 files changed:
builtin/blame.c
builtin/checkout.c
builtin/diff.c
builtin/merge.c
diff-no-index.c
diff.c
diff.h
merge-recursive.c
notes-merge.c
patch-ids.c
revision.c
submodule.c
tree-diff.c