mirror of
https://github.com/git/git.git
synced 2024-11-15 05:33:04 +01:00
cd4f09e383
Most of git's traversals are robust against minor breakages in commit data. For example, "git log" will still output an entry for a commit that has a broken encoding or missing author, and will not abort the whole operation. Shortlog, on the other hand, will die as soon as it sees a commit without an author, meaning that a repository with a broken commit cannot get any shortlog output at all. Let's downgrade this fatal error to a warning, and continue the operation. We simply ignore the commit and do not count it in the total (since we do not have any author under which to file it). Alternatively, we could output some kind of "<empty>" record to collect these bogus commits. It is probably not worth it, though; we have already warned to stderr, so the user is aware that such bogosities exist, and any placeholder we came up with would either be syntactically invalid, or would potentially conflict with real data. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
191 lines
5 KiB
Bash
Executable file
191 lines
5 KiB
Bash
Executable file
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2006 Johannes E. Schindelin
|
|
#
|
|
|
|
test_description='git shortlog
|
|
'
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'setup' '
|
|
echo 1 >a1 &&
|
|
git add a1 &&
|
|
tree=$(git write-tree) &&
|
|
commit=$(printf "%s\n" "Test" "" | git commit-tree "$tree") &&
|
|
git update-ref HEAD "$commit" &&
|
|
|
|
echo 2 >a1 &&
|
|
git commit --quiet -m "This is a very, very long first line for the commit message to see if it is wrapped correctly" a1 &&
|
|
|
|
# test if the wrapping is still valid
|
|
# when replacing all is by treble clefs.
|
|
echo 3 >a1 &&
|
|
git commit --quiet -m "$(
|
|
echo "This is a very, very long first line for the commit message to see if it is wrapped correctly" |
|
|
sed "s/i/1234/g" |
|
|
tr 1234 "\360\235\204\236")" a1 &&
|
|
|
|
# now fsck up the utf8
|
|
git config i18n.commitencoding non-utf-8 &&
|
|
echo 4 >a1 &&
|
|
git commit --quiet -m "$(
|
|
echo "This is a very, very long first line for the commit message to see if it is wrapped correctly" |
|
|
sed "s/i/1234/g" |
|
|
tr 1234 "\370\235\204\236")" a1 &&
|
|
|
|
echo 5 >a1 &&
|
|
git commit --quiet -m "a 12 34 56 78" a1 &&
|
|
|
|
echo 6 >a1 &&
|
|
git commit --quiet -m "Commit by someone else" \
|
|
--author="Someone else <not!me>" a1 &&
|
|
|
|
cat >expect.template <<-\EOF
|
|
A U Thor (5):
|
|
SUBJECT
|
|
SUBJECT
|
|
SUBJECT
|
|
SUBJECT
|
|
SUBJECT
|
|
|
|
Someone else (1):
|
|
SUBJECT
|
|
|
|
EOF
|
|
'
|
|
|
|
fuzz() {
|
|
file=$1 &&
|
|
sed "
|
|
s/$_x40/OBJECT_NAME/g
|
|
s/$_x05/OBJID/g
|
|
s/^ \{6\}[CTa].*/ SUBJECT/g
|
|
s/^ \{8\}[^ ].*/ CONTINUATION/g
|
|
" <"$file" >"$file.fuzzy" &&
|
|
sed "/CONTINUATION/ d" <"$file.fuzzy"
|
|
}
|
|
|
|
test_expect_success 'default output format' '
|
|
git shortlog HEAD >log &&
|
|
fuzz log >log.predictable &&
|
|
test_cmp expect.template log.predictable
|
|
'
|
|
|
|
test_expect_success 'pretty format' '
|
|
sed s/SUBJECT/OBJECT_NAME/ expect.template >expect &&
|
|
git shortlog --format="%H" HEAD >log &&
|
|
fuzz log >log.predictable &&
|
|
test_cmp expect log.predictable
|
|
'
|
|
|
|
test_expect_success '--abbrev' '
|
|
sed s/SUBJECT/OBJID/ expect.template >expect &&
|
|
git shortlog --format="%h" --abbrev=5 HEAD >log &&
|
|
fuzz log >log.predictable &&
|
|
test_cmp expect log.predictable
|
|
'
|
|
|
|
test_expect_success 'output from user-defined format is re-wrapped' '
|
|
sed "s/SUBJECT/two lines/" expect.template >expect &&
|
|
git shortlog --format="two%nlines" HEAD >log &&
|
|
fuzz log >log.predictable &&
|
|
test_cmp expect log.predictable
|
|
'
|
|
|
|
test_expect_success 'shortlog wrapping' '
|
|
cat >expect <<\EOF &&
|
|
A U Thor (5):
|
|
Test
|
|
This is a very, very long first line for the commit message to see if
|
|
it is wrapped correctly
|
|
Th𝄞s 𝄞s a very, very long f𝄞rst l𝄞ne for the comm𝄞t message to see 𝄞f
|
|
𝄞t 𝄞s wrapped correctly
|
|
Th����s ����s a very, very long f����rst l����ne for the comm����t
|
|
message to see ����f ����t ����s wrapped correctly
|
|
a 12 34
|
|
56 78
|
|
|
|
Someone else (1):
|
|
Commit by someone else
|
|
|
|
EOF
|
|
git shortlog -w HEAD >out &&
|
|
test_cmp expect out
|
|
'
|
|
|
|
test_expect_success 'shortlog from non-git directory' '
|
|
git log HEAD >log &&
|
|
GIT_DIR=non-existing git shortlog -w <log >out &&
|
|
test_cmp expect out
|
|
'
|
|
|
|
test_expect_success 'shortlog should add newline when input line matches wraplen' '
|
|
cat >expect <<\EOF &&
|
|
A U Thor (2):
|
|
bbbbbbbbbbbbbbbbbb: bbbbbbbb bbb bbbb bbbbbbb bb bbbb bbb bbbbb bbbbbb
|
|
aaaaaaaaaaaaaaaaaaaaaa: aaaaaa aaaaaaaaaa aaaa aaaaaaaa aa aaaa aa aaa
|
|
|
|
EOF
|
|
git shortlog -w >out <<\EOF &&
|
|
commit 0000000000000000000000000000000000000001
|
|
Author: A U Thor <author@example.com>
|
|
Date: Thu Apr 7 15:14:13 2005 -0700
|
|
|
|
aaaaaaaaaaaaaaaaaaaaaa: aaaaaa aaaaaaaaaa aaaa aaaaaaaa aa aaaa aa aaa
|
|
|
|
commit 0000000000000000000000000000000000000002
|
|
Author: A U Thor <author@example.com>
|
|
Date: Thu Apr 7 15:14:13 2005 -0700
|
|
|
|
bbbbbbbbbbbbbbbbbb: bbbbbbbb bbb bbbb bbbbbbb bb bbbb bbb bbbbb bbbbbb
|
|
|
|
EOF
|
|
test_cmp expect out
|
|
'
|
|
|
|
iconvfromutf8toiso88591() {
|
|
printf "%s" "$*" | iconv -f UTF-8 -t ISO8859-1
|
|
}
|
|
|
|
DSCHO="Jöhännës \"Dschö\" Schindëlin"
|
|
DSCHOE="$DSCHO <Johannes.Schindelin@gmx.de>"
|
|
MSG1="set a1 to 2 and some non-ASCII chars: Äßø"
|
|
MSG2="set a1 to 3 and some non-ASCII chars: áæï"
|
|
cat > expect << EOF
|
|
$DSCHO (2):
|
|
$MSG1
|
|
$MSG2
|
|
|
|
EOF
|
|
|
|
test_expect_success 'shortlog encoding' '
|
|
git reset --hard "$commit" &&
|
|
git config --unset i18n.commitencoding &&
|
|
echo 2 > a1 &&
|
|
git commit --quiet -m "$MSG1" --author="$DSCHOE" a1 &&
|
|
git config i18n.commitencoding "ISO8859-1" &&
|
|
echo 3 > a1 &&
|
|
git commit --quiet -m "$(iconvfromutf8toiso88591 "$MSG2")" \
|
|
--author="$(iconvfromutf8toiso88591 "$DSCHOE")" a1 &&
|
|
git config --unset i18n.commitencoding &&
|
|
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_done
|