summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-12-10 16:13:14 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-12-10 16:13:14 -0800
commit7bf040c5bfcac4f9efe9b3fc9879756728fc098f (patch)
tree1a4c6088ed27040513eadf5ddd8d64c57e9a75fa /t
parentMerge branch 'mg/maint-tag-rfc1991' into maint (diff)
parentlog.decorate: accept 0/1 bool values (diff)
downloadtgif-7bf040c5bfcac4f9efe9b3fc9879756728fc098f.tar.xz
Merge branch 'jk/maint-decorate-01-bool' into maint
* 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 2e51356947..2043bb8867 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 &&