Sync with maint

diff --git a/t/t4201-shortlog.sh b/t/t4201-shortlog.sh
index f5e63670faa0c5acc38adc17d32ae66b59d66b64..a9773658f09e92578b489b1b5b65fc87599cb8ae 100755 (executable)
--- a/t/t4201-shortlog.sh
+++ b/t/t4201-shortlog.sh
@@ -115,7 +115,7 @@ EOF
 '
 
 test_expect_success !MINGW 'shortlog from non-git directory' '
-       git log HEAD >log &&
+       git log --no-expand-tabs HEAD >log &&
        GIT_DIR=non-existing git shortlog -w <log >out &&
        test_cmp expect out
 '