diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-06-04 10:20:57 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-04 10:20:57 +0900 |
| commit | fb11de9ef58305a3dce6ebaaf53cc8c7ff9c5231 (patch) | |
| tree | 6a940ab652f29142b7d11add8bd632d358af843b /t | |
| parent | 6c940eb94d8c6ed75413826e067df78f30b5707f (diff) | |
| parent | c74271aae74c951ab321aa16fe573ea3bcab86ba (diff) | |
| download | git-fb11de9ef58305a3dce6ebaaf53cc8c7ff9c5231.tar.gz git-fb11de9ef58305a3dce6ebaaf53cc8c7ff9c5231.tar.xz | |
Merge branch 'ah/log-decorate-default-to-auto' into maint
Setting "log.decorate=false" in the configuration file did not take
effect in v2.13, which has been corrected.
* ah/log-decorate-default-to-auto:
builtin/log: honor log.decorate
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4202-log.sh | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/t/t4202-log.sh b/t/t4202-log.sh index f57799071..1c7d6729c 100755 --- a/t/t4202-log.sh +++ b/t/t4202-log.sh @@ -577,6 +577,18 @@ test_expect_success 'log.decorate configuration' ' ' +test_expect_success 'log.decorate config parsing' ' + git log --oneline --decorate=full >expect.full && + git log --oneline --decorate=short >expect.short && + + test_config log.decorate full && + test_config log.mailmap true && + git log --oneline >actual && + test_cmp expect.full actual && + git log --oneline --decorate=short >actual && + test_cmp expect.short actual +' + test_expect_success TTY 'log output on a TTY' ' git log --oneline --decorate >expect.short && |