Merge branch 'bh/diff-highlight-graph' into maint

diff --git a/t/t4201-shortlog.sh b/t/t4201-shortlog.sh
index a9773658f09e92578b489b1b5b65fc87599cb8ae..ae08b57712e382a4cba7f7a51a499b4621a38c84 100755 (executable)
--- a/t/t4201-shortlog.sh
+++ b/t/t4201-shortlog.sh
@@ -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