summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-12-27 08:11:44 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-12-27 08:11:44 (GMT)
commitad1b4e2c0e5521da39e13088f197b256303a2fc8 (patch)
treea27f3769c1d19b968db460186360bc45edb365a9 /t
parentc5139e0e3811ea3f6014187e76b243ccf287cb83 (diff)
parentbc44f9332a8f6b258d7b7d2ecba063aa7f48e182 (diff)
downloadgit-ad1b4e2c0e5521da39e13088f197b256303a2fc8.zip
git-ad1b4e2c0e5521da39e13088f197b256303a2fc8.tar.gz
git-ad1b4e2c0e5521da39e13088f197b256303a2fc8.tar.bz2
Merge branch 'lt/shortlog-by-committer'
"git shortlog" learned "--committer" option to group commits by committer, instead of author. * lt/shortlog-by-committer: t4201: make tests work with and without the MINGW prerequiste shortlog: test and document --committer option shortlog: group by committer information
Diffstat (limited to 't')
-rwxr-xr-xt/t4201-shortlog.sh19
1 files changed, 19 insertions, 0 deletions
diff --git a/t/t4201-shortlog.sh b/t/t4201-shortlog.sh
index ae08b57..9df054b 100755
--- a/t/t4201-shortlog.sh
+++ b/t/t4201-shortlog.sh
@@ -190,4 +190,23 @@ test_expect_success 'shortlog with --output=<file>' '
test_line_count = 3 shortlog
'
+test_expect_success 'shortlog --committer (internal)' '
+ git checkout --orphan side &&
+ git commit --allow-empty -m one &&
+ git commit --allow-empty -m two &&
+ GIT_COMMITTER_NAME="Sin Nombre" git commit --allow-empty -m three &&
+
+ cat >expect <<-\EOF &&
+ 2 C O Mitter
+ 1 Sin Nombre
+ EOF
+ git shortlog -nsc HEAD >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'shortlog --committer (external)' '
+ git log --format=full | git shortlog -nsc >actual &&
+ test_cmp expect actual
+'
+
test_done