Merge branch 'bw/grep-recurse-submodules'

diff --git a/t/t4202-log.sh b/t/t4202-log.sh
index 36d120c969f6c116c2bed19c8bb0c027919d66a9..8f155da7a50a657db9fd092e24639f67cd03cd24 100755 (executable)
--- a/t/t4202-log.sh
+++ b/t/t4202-log.sh
@@ -750,7 +750,7 @@ test_expect_success 'log.decorate config parsing' '
 '
 
 test_expect_success TTY 'log output on a TTY' '
-       git log --oneline --decorate >expect.short &&
+       git log --color --oneline --decorate >expect.short &&
 
        test_terminal git log --oneline >actual &&
        test_cmp expect.short actual