summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-12-08 11:24:14 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-12-08 11:24:14 -0800
commit5e826019ef48e1d324c9a1866ed65f5be8990998 (patch)
treee826d2b4e188dfd8bd2df1013bff89ac3d60017d
parentMerge branch 'gc/http-with-non-ascii-username-url' (diff)
parentlog.decorate: accept 0/1 bool values (diff)
downloadtgif-5e826019ef48e1d324c9a1866ed65f5be8990998.tar.xz
Merge branch 'jk/maint-decorate-01-bool'
* jk/maint-decorate-01-bool: log.decorate: accept 0/1 bool values
-rw-r--r--config.c16
-rwxr-xr-xt/t4202-log.sh9
2 files changed, 23 insertions, 2 deletions
diff --git a/config.c b/config.c
index f138c34721..32c0b2c41e 100644
--- a/config.c
+++ b/config.c
@@ -410,7 +410,7 @@ unsigned long git_config_ulong(const char *name, const char *value)
return ret;
}
-int git_config_maybe_bool(const char *name, const char *value)
+static int git_config_maybe_bool_text(const char *name, const char *value)
{
if (!value)
return 1;
@@ -427,9 +427,21 @@ int git_config_maybe_bool(const char *name, const char *value)
return -1;
}
+int git_config_maybe_bool(const char *name, const char *value)
+{
+ int v = git_config_maybe_bool_text(name, value);
+ if (0 <= v)
+ return v;
+ if (!strcmp(value, "0"))
+ return 0;
+ if (!strcmp(value, "1"))
+ return 1;
+ return -1;
+}
+
int git_config_bool_or_int(const char *name, const char *value, int *is_bool)
{
- int v = git_config_maybe_bool(name, value);
+ int v = git_config_maybe_bool_text(name, value);
if (0 <= v) {
*is_bool = 1;
return v;
diff --git a/t/t4202-log.sh b/t/t4202-log.sh
index a8c33d5703..2fcc31a6f3 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 &&