diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-04-08 10:17:17 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-04-08 23:13:48 -0700 |
| commit | 4f62c2bc577bbb85b65f3261c7fab7ef74def4cd (patch) | |
| tree | f741d67400d05f93da6ca1edc46b880482543d17 /t/t4202-log.sh | |
| parent | b0e621adfd5a60b7cbe95e59f09c87f0870321cb (diff) | |
| download | git-4f62c2bc577bbb85b65f3261c7fab7ef74def4cd.tar.gz git-4f62c2bc577bbb85b65f3261c7fab7ef74def4cd.tar.xz | |
log.decorate: only ignore it under "log --pretty=raw"
Unlike notes that are often multi-line and disrupting to be placed in many
output formats, a decoration is designed to be a small token that can be
tacked after an existing line of the output where a commit object name sits.
Disabling log.decorate for something like "log --oneline" would defeat the
purpose of the configuration.
We _might_ want to change it further in the future to force scripts that
do not want to be broken by random end user configurations to explicitly
say "log --no-decorate", but that would be an incompatible change that
needs the usual multi-release-cycle deprecation process.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4202-log.sh')
| -rwxr-xr-x | t/t4202-log.sh | 44 |
1 files changed, 16 insertions, 28 deletions
diff --git a/t/t4202-log.sh b/t/t4202-log.sh index 166de4479..2230e606e 100755 --- a/t/t4202-log.sh +++ b/t/t4202-log.sh @@ -390,62 +390,50 @@ test_expect_success 'log --graph with merge' ' test_expect_success 'log.decorate configuration' ' git config --unset-all log.decorate || : - git log >expect.none && - git log --decorate >expect.short && - git log --decorate=full >expect.full && - git log --oneline >expect.oneline && + git log --oneline >expect.none && + git log --oneline --decorate >expect.short && + git log --oneline --decorate=full >expect.full && echo "[log] decorate" >>.git/config && - git log >actual && - test_cmp expect.short actual && git log --oneline >actual && - test_cmp expect.oneline actual && + test_cmp expect.short actual && git config --unset-all log.decorate && git config log.decorate true && - git log >actual && + git log --oneline >actual && test_cmp expect.short actual && - git log --decorate=full >actual && + git log --oneline --decorate=full >actual && test_cmp expect.full actual && - git log --decorate=no >actual && + git log --oneline --decorate=no >actual && test_cmp expect.none actual && - git log --oneline >actual && - test_cmp expect.oneline actual && git config --unset-all log.decorate && git config log.decorate no && - git log >actual && + git log --oneline >actual && test_cmp expect.none actual && - git log --decorate >actual && + git log --oneline --decorate >actual && test_cmp expect.short actual && - git log --decorate=full >actual && + git log --oneline --decorate=full >actual && test_cmp expect.full actual && - git log --oneline >actual && - test_cmp expect.oneline actual && git config --unset-all log.decorate && git config log.decorate short && - git log >actual && + git log --oneline >actual && test_cmp expect.short actual && - git log --no-decorate >actual && + git log --oneline --no-decorate >actual && test_cmp expect.none actual && - git log --decorate=full >actual && + git log --oneline --decorate=full >actual && test_cmp expect.full actual && - git log --oneline >actual && - test_cmp expect.oneline actual && git config --unset-all log.decorate && git config log.decorate full && - git log >actual && + git log --oneline >actual && test_cmp expect.full actual && - git log --no-decorate >actual && + git log --oneline --no-decorate >actual && test_cmp expect.none actual && - git log --decorate >actual && + git log --oneline --decorate >actual && test_cmp expect.short actual - git log --oneline >actual && - test_cmp expect.oneline actual && - : ' test_done |