diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-05-23 13:46:02 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-05-23 13:46:03 +0900 |
| commit | bf32fc5664a1946028a93859005600a70ee1c660 (patch) | |
| tree | 036441bfaf459eb9b45155f6d7c222920bb70d74 /t | |
| parent | Merge branch 'bw/submodule-with-bs-path' (diff) | |
| parent | builtin/log: honor log.decorate (diff) | |
| download | tgif-bf32fc5664a1946028a93859005600a70ee1c660.tar.xz | |
Merge branch 'ah/log-decorate-default-to-auto'
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 f577990716..1c7d6729c6 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 && |