mirror of
https://github.com/git/git
synced 2024-11-05 18:59:29 +00:00
7abcbcb7ea
The top-level &&-chain checker built into t/test-lib.sh causes tests to
magically exit with code 117 if the &&-chain is broken. However, it has
the shortcoming that the magic does not work within `{...}` groups,
`(...)` subshells, `$(...)` substitutions, or within bodies of compound
statements, such as `if`, `for`, `while`, `case`, etc. `chainlint.sed`
partly fills in the gap by catching broken &&-chains in `(...)`
subshells, but bugs can still lurk behind broken &&-chains in the other
cases.
Fix broken &&-chains in `{...}` groups in order to reduce the number of
possible lurking bugs.
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Reviewed-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
143 lines
3.7 KiB
Bash
Executable file
143 lines
3.7 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='git blame'
|
|
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
|
|
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
|
|
|
. ./test-lib.sh
|
|
|
|
PROG='git blame -c'
|
|
. "$TEST_DIRECTORY"/annotate-tests.sh
|
|
|
|
test_expect_success 'setup' '
|
|
hexsz=$(test_oid hexsz)
|
|
'
|
|
|
|
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 $hexsz -l HEAD &&
|
|
check_abbrev $((hexsz - 1)) -l ^HEAD
|
|
'
|
|
|
|
test_expect_success 'blame --abbrev with full length behaves like -l' '
|
|
check_abbrev $hexsz --abbrev=$hexsz HEAD &&
|
|
check_abbrev $((hexsz - 1)) --abbrev=$hexsz ^HEAD
|
|
'
|
|
|
|
test_expect_success '--no-abbrev works like --abbrev with full length' '
|
|
check_abbrev $hexsz --no-abbrev
|
|
'
|
|
|
|
test_expect_success '--exclude-promisor-objects does not BUG-crash' '
|
|
test_must_fail git blame --exclude-promisor-objects one
|
|
'
|
|
|
|
test_expect_success 'blame with uncommitted edits in partial clone does not crash' '
|
|
git init server &&
|
|
echo foo >server/file.txt &&
|
|
git -C server add file.txt &&
|
|
git -C server commit -m file &&
|
|
|
|
git clone --filter=blob:none "file://$(pwd)/server" client &&
|
|
echo bar >>client/file.txt &&
|
|
git -C client blame file.txt
|
|
'
|
|
|
|
test_done
|