Merge branch 'jh/status-v2-porcelain'

diff --git a/t/t4201-shortlog.sh b/t/t4201-shortlog.sh
index f5e63670faa0c5acc38adc17d32ae66b59d66b64..ae08b57712e382a4cba7f7a51a499b4621a38c84 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
 '
@@ -184,4 +184,10 @@ test_expect_success 'shortlog with revision pseudo options' '
        git shortlog --exclude=refs/heads/m* --all
 '
 
+test_expect_success 'shortlog with --output=<file>' '
+       git shortlog --output=shortlog -1 master >output &&
+       test ! -s output &&
+       test_line_count = 3 shortlog
+'
+
 test_done