diff options
| author | Jeff King <peff@peff.net> | 2010-11-17 12:00:45 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-11-17 10:59:23 -0800 |
| commit | b2be2f6aeaa8f4af602679e5571d2e916a259d91 (patch) | |
| tree | 51669e54d8186e8b7050dfd584134412c1fd5c3e /t/t4202-log.sh | |
| parent | f772c34ce09a49eb553240eb672bf0cc2dbcb10a (diff) | |
| download | git-b2be2f6aeaa8f4af602679e5571d2e916a259d91.tar.gz git-b2be2f6aeaa8f4af602679e5571d2e916a259d91.tar.xz | |
log.decorate: accept 0/1 bool values
We explicitly document "0" and "1" as synonyms for "false"
and "true" in boolean config options. However, we don't
actually handle those values in git_config_maybe_bool.
In most cases this works fine, as we call git_config_bool,
which in turn calls git_config_bool_or_int, which in turn
calls git_config_maybe_bool. Values of 0/1 are considered
"not bool", but their integer values end up being converted
to the corresponding boolean values.
However, the log.decorate code looks for maybe_bool
explicitly, so that it can fall back to the "short" and
"full" strings. It does not handle 0/1 at all, and considers
them invalid values.
We cannot simply add 0/1 support to git_config_maybe_bool.
That would confuse git_config_bool_or_int, which may want to
distinguish the integer values "0" and "1" from bools.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4202-log.sh')
| -rwxr-xr-x | t/t4202-log.sh | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/t/t4202-log.sh b/t/t4202-log.sh index 2e5135694..2043bb886 100755 --- a/t/t4202-log.sh +++ b/t/t4202-log.sh @@ -422,6 +422,15 @@ test_expect_success 'log.decorate configuration' ' test_cmp expect.full actual && git config --unset-all log.decorate && + git config log.decorate 1 && + git log --oneline >actual && + test_cmp expect.short actual && + git log --oneline --decorate=full >actual && + test_cmp expect.full actual && + git log --oneline --decorate=no >actual && + test_cmp expect.none actual && + + git config --unset-all log.decorate && git config log.decorate short && git log --oneline >actual && test_cmp expect.short actual && |