]> git.ipfire.org Git - thirdparty/git.git/commit - diff.c
drop odd return value semantics from userdiff_config
authorJeff King <peff@peff.net>
Tue, 7 Feb 2012 18:23:02 +0000 (13:23 -0500)
committerJunio C Hamano <gitster@pobox.com>
Tue, 7 Feb 2012 18:44:54 +0000 (10:44 -0800)
commit6680a0874f86600cc8b4b5327384934d83d752a8
treec1ed228ef790cc7d69b013fd12393ef10792c804
parent65da088244a1c220a6dbc5bf01c758b4b9df63b3
drop odd return value semantics from userdiff_config

When the userdiff_config function was introduced in be58e70
(diff: unify external diff and funcname parsing code,
2008-10-05), it used a return value convention unlike any
other config callback. Like other callbacks, it used "-1" to
signal error. But it returned "1" to indicate that it found
something, and "0" otherwise; other callbacks simply
returned "0" to indicate that no error occurred.

This distinction was necessary at the time, because the
userdiff namespace overlapped slightly with the color
configuration namespace. So "diff.color.foo" could mean "the
'foo' slot of diff coloring" or "the 'foo' component of the
"color" userdiff driver". Because the color-parsing code
would die on an unknown color slot, we needed the userdiff
code to indicate that it had matched the variable, letting
us bypass the color-parsing code entirely.

Later, in 8b8e862 (ignore unknown color configuration,
2009-12-12), the color-parsing code learned to silently
ignore unknown slots. This means we no longer need to
protect userdiff-matched variables from reaching the
color-parsing code.

We can therefore change the userdiff_config calling
convention to a more normal one. This drops some code from
each caller, which is nice. But more importantly, it reduces
the cognitive load for readers who may wonder why
userdiff_config is unlike every other config callback.

There's no need to add a new test confirming that this
works; t4020 already contains a test that sets
diff.color.external.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/blame.c
builtin/cat-file.c
builtin/grep.c
diff.c
userdiff.c