1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-30 05:47:53 +01:00
git/t/t8002-blame.sh
Jeff King ed58d8088b blame: handle --no-abbrev
You can already ask blame for full sha1s with "-l" or with
"--abbrev=40". But for consistency with other parts of Git,
we should support "--no-abbrev".

Worse, blame already accepts --no-abbrev, but it's totally
broken. When we see --no-abbrev, the abbrev variable is set
to 0, which is then used as a printf precision. For regular
sha1s, that means we print nothing at all (which is very
wrong). For boundary commits we decrement it to "-1", which
printf interprets as "no limit" (which is almost correct,
except it misses the 39-length magic explained in the
previous commit).

Let's detect --no-abbrev and behave as if --abbrev=40 was
given.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-01-07 19:34:54 -08:00

121 lines
3 KiB
Bash
Executable file

#!/bin/sh
test_description='git blame'
. ./test-lib.sh
PROG='git blame -c'
. "$TEST_DIRECTORY"/annotate-tests.sh
test_expect_success 'blame untracked file in empty repo' '
>untracked &&
test_must_fail git blame untracked
'
PROG='git blame -c -e'
test_expect_success 'blame --show-email' '
check_count \
"<A@test.git>" 1 \
"<B@test.git>" 1 \
"<B1@test.git>" 1 \
"<B2@test.git>" 1 \
"<author@example.com>" 1 \
"<C@test.git>" 1 \
"<D@test.git>" 1 \
"<E at test dot git>" 1
'
test_expect_success 'setup showEmail tests' '
echo "bin: test number 1" >one &&
git add one &&
GIT_AUTHOR_NAME=name1 \
GIT_AUTHOR_EMAIL=email1@test.git \
git commit -m First --date="2010-01-01 01:00:00" &&
cat >expected_n <<-\EOF &&
(name1 2010-01-01 01:00:00 +0000 1) bin: test number 1
EOF
cat >expected_e <<-\EOF
(<email1@test.git> 2010-01-01 01:00:00 +0000 1) bin: test number 1
EOF
'
find_blame () {
sed -e 's/^[^(]*//'
}
test_expect_success 'blame with no options and no config' '
git blame one >blame &&
find_blame <blame >result &&
test_cmp expected_n result
'
test_expect_success 'blame with showemail options' '
git blame --show-email one >blame1 &&
find_blame <blame1 >result &&
test_cmp expected_e result &&
git blame -e one >blame2 &&
find_blame <blame2 >result &&
test_cmp expected_e result &&
git blame --no-show-email one >blame3 &&
find_blame <blame3 >result &&
test_cmp expected_n result
'
test_expect_success 'blame with showEmail config false' '
git config blame.showEmail false &&
git blame one >blame1 &&
find_blame <blame1 >result &&
test_cmp expected_n result &&
git blame --show-email one >blame2 &&
find_blame <blame2 >result &&
test_cmp expected_e result &&
git blame -e one >blame3 &&
find_blame <blame3 >result &&
test_cmp expected_e result &&
git blame --no-show-email one >blame4 &&
find_blame <blame4 >result &&
test_cmp expected_n result
'
test_expect_success 'blame with showEmail config true' '
git config blame.showEmail true &&
git blame one >blame1 &&
find_blame <blame1 >result &&
test_cmp expected_e result &&
git blame --no-show-email one >blame2 &&
find_blame <blame2 >result &&
test_cmp expected_n result
'
test_expect_success 'set up abbrev tests' '
test_commit abbrev &&
sha1=$(git rev-parse --verify HEAD) &&
check_abbrev () {
expect=$1; shift
echo $sha1 | cut -c 1-$expect >expect &&
git blame "$@" abbrev.t >actual &&
perl -lne "/[0-9a-f]+/ and print \$&" <actual >actual.sha &&
test_cmp expect actual.sha
}
'
test_expect_success 'blame --abbrev=<n> works' '
# non-boundary commits get +1 for alignment
check_abbrev 31 --abbrev=30 HEAD &&
check_abbrev 30 --abbrev=30 ^HEAD
'
test_expect_success 'blame -l aligns regular and boundary commits' '
check_abbrev 40 -l HEAD &&
check_abbrev 39 -l ^HEAD
'
test_expect_success 'blame --abbrev=40 behaves like -l' '
check_abbrev 40 --abbrev=40 HEAD &&
check_abbrev 39 --abbrev=40 ^HEAD
'
test_expect_success '--no-abbrev works like --abbrev=40' '
check_abbrev 40 --no-abbrev
'
test_done