Merge branch 'bn/http-cookiefile-config'

diff --git a/t/t4201-shortlog.sh b/t/t4201-shortlog.sh
index 7600a3e3e8f4fab47abd68a29bb06defb6bbce02..a9773658f09e92578b489b1b5b65fc87599cb8ae 100755 (executable)
--- a/t/t4201-shortlog.sh
+++ b/t/t4201-shortlog.sh
@@ -115,7 +115,13 @@ 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
+'
+
+test_expect_success !MINGW 'shortlog can read --format=raw output' '
+       git log --format=raw HEAD >log &&
        GIT_DIR=non-existing git shortlog -w <log >out &&
        test_cmp expect out
 '
@@ -172,22 +178,6 @@ test_expect_success !MINGW 'shortlog encoding' '
        git shortlog HEAD~2.. > out &&
 test_cmp expect out'
 
-test_expect_success 'shortlog ignores commits with missing authors' '
-       git commit --allow-empty -m normal &&
-       git commit --allow-empty -m soon-to-be-broken &&
-       git cat-file commit HEAD >commit.tmp &&
-       sed "/^author/d" commit.tmp >broken.tmp &&
-       commit=$(git hash-object -w -t commit --stdin <broken.tmp) &&
-       git update-ref HEAD $commit &&
-       cat >expect <<-\EOF &&
-       A U Thor (1):
-             normal
-
-       EOF
-       git shortlog HEAD~2.. >actual &&
-       test_cmp expect actual
-'
-
 test_expect_success 'shortlog with revision pseudo options' '
        git shortlog --all &&
        git shortlog --branches &&