summaryrefslogtreecommitdiff
path: root/t/t4202-log.sh
diff options
context:
space:
mode:
authorAlex Henrie <alexhenrie24@gmail.com>2017-03-24 05:46:31 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-03-24 17:38:43 (GMT)
commit940a911f8ec00e291a66c2d1ed05293a38ae6138 (patch)
treecf74ecf92d0ba353999220c2dbb07fc65ccfdde4 /t/t4202-log.sh
parentc0f9c705890ac30871c70219c4b08d740fb40e2e (diff)
downloadgit-940a911f8ec00e291a66c2d1ed05293a38ae6138.zip
git-940a911f8ec00e291a66c2d1ed05293a38ae6138.tar.gz
git-940a911f8ec00e291a66c2d1ed05293a38ae6138.tar.bz2
log: if --decorate is not given, default to --decorate=auto
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4202-log.sh')
-rwxr-xr-xt/t4202-log.sh10
1 files changed, 9 insertions, 1 deletions
diff --git a/t/t4202-log.sh b/t/t4202-log.sh
index 48b55bf..f577990 100755
--- a/t/t4202-log.sh
+++ b/t/t4202-log.sh
@@ -4,6 +4,7 @@ test_description='git log'
. ./test-lib.sh
. "$TEST_DIRECTORY/lib-gpg.sh"
+. "$TEST_DIRECTORY/lib-terminal.sh"
test_expect_success setup '
@@ -520,7 +521,7 @@ test_expect_success 'log --graph with merge' '
'
test_expect_success 'log.decorate configuration' '
- git log --oneline >expect.none &&
+ git log --oneline --no-decorate >expect.none &&
git log --oneline --decorate >expect.short &&
git log --oneline --decorate=full >expect.full &&
@@ -576,6 +577,13 @@ test_expect_success 'log.decorate configuration' '
'
+test_expect_success TTY 'log output on a TTY' '
+ git log --oneline --decorate >expect.short &&
+
+ test_terminal git log --oneline >actual &&
+ test_cmp expect.short actual
+'
+
test_expect_success 'reflog is expected format' '
git log -g --abbrev-commit --pretty=oneline >expect &&
git reflog >actual &&