summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-12-08 11:24:14 -0800
committerJunio C Hamano <gitster@pobox.com>2010-12-08 11:24:14 -0800
commit5e826019ef48e1d324c9a1866ed65f5be8990998 (patch)
treee826d2b4e188dfd8bd2df1013bff89ac3d60017d /t
parent16c06fcb39eec5505c383b412ca2254bccf354a5 (diff)
parentb2be2f6aeaa8f4af602679e5571d2e916a259d91 (diff)
downloadgit-5e826019ef48e1d324c9a1866ed65f5be8990998.tar.gz
Merge branch 'jk/maint-decorate-01-bool'
* jk/maint-decorate-01-bool: log.decorate: accept 0/1 bool values
Diffstat (limited to 't')
-rwxr-xr-xt/t4202-log.sh9
1 files changed, 9 insertions, 0 deletions
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 &&