mirror of
https://github.com/git/git
synced 2024-10-02 14:45:21 +00:00
t8001/t8002 (blame): modernize style
In particular, - indent with tabs - cuddle test description and opening body quote with test_expect_foo - normalize test descriptions and case - remove whitepsace following redirection operator - use standardized filenames (such as "actual", "expected") Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Eric Sunshine
Junio C Hamano
parent
3bf65f9e62
commit
e37f39c134
|
|
@ -2,11 +2,11 @@
|
|||
# sourced from t8001-annotate.sh and t8002-blame.sh.
|
||||
|
||||
check_count () {
|
||||
head=
|
||||
case "$1" in -h) head="$2"; shift; shift ;; esac
|
||||
echo "$PROG file $head" >&4
|
||||
$PROG file $head >.result || return 1
|
||||
cat .result | perl -e '
|
||||
head= &&
|
||||
case "$1" in -h) head="$2"; shift; shift ;; esac &&
|
||||
echo "$PROG file $head" >&4 &&
|
||||
$PROG file $head >actual &&
|
||||
perl -e '
|
||||
my %expect = (@ARGV);
|
||||
my %count = map { $_ => 0 } keys %expect;
|
||||
while (<STDIN>) {
|
||||
|
|
@ -31,107 +31,114 @@ check_count () {
|
|||
print STDERR "Author $author (expected $value, attributed $count) $ok\n";
|
||||
}
|
||||
exit($bad);
|
||||
' "$@"
|
||||
' "$@" <actual
|
||||
}
|
||||
|
||||
test_expect_success \
|
||||
'prepare reference tree' \
|
||||
'echo "1A quick brown fox jumps over the" >file &&
|
||||
echo "lazy dog" >>file &&
|
||||
git add file &&
|
||||
GIT_AUTHOR_NAME="A" GIT_AUTHOR_EMAIL="A@test.git" git commit -a -m "Initial."'
|
||||
test_expect_success 'setup A lines' '
|
||||
echo "1A quick brown fox jumps over the" >file &&
|
||||
echo "lazy dog" >>file &&
|
||||
git add file &&
|
||||
GIT_AUTHOR_NAME="A" GIT_AUTHOR_EMAIL="A@test.git" \
|
||||
git commit -a -m "Initial."
|
||||
'
|
||||
|
||||
test_expect_success \
|
||||
'check all lines blamed on A' \
|
||||
'check_count A 2'
|
||||
test_expect_success 'blame 1 author' '
|
||||
check_count A 2
|
||||
'
|
||||
|
||||
test_expect_success \
|
||||
'Setup new lines blamed on B' \
|
||||
'echo "2A quick brown fox jumps over the" >>file &&
|
||||
echo "lazy dog" >> file &&
|
||||
GIT_AUTHOR_NAME="B" GIT_AUTHOR_EMAIL="B@test.git" git commit -a -m "Second."'
|
||||
test_expect_success 'setup B lines' '
|
||||
echo "2A quick brown fox jumps over the" >>file &&
|
||||
echo "lazy dog" >>file &&
|
||||
GIT_AUTHOR_NAME="B" GIT_AUTHOR_EMAIL="B@test.git" \
|
||||
git commit -a -m "Second."
|
||||
'
|
||||
|
||||
test_expect_success \
|
||||
'Two lines blamed on A, two on B' \
|
||||
'check_count A 2 B 2'
|
||||
test_expect_success 'blame 2 authors' '
|
||||
check_count A 2 B 2
|
||||
'
|
||||
|
||||
test_expect_success \
|
||||
'merge-setup part 1' \
|
||||
'git checkout -b branch1 master &&
|
||||
echo "3A slow green fox jumps into the" >> file &&
|
||||
echo "well." >> file &&
|
||||
GIT_AUTHOR_NAME="B1" GIT_AUTHOR_EMAIL="B1@test.git" git commit -a -m "Branch1-1"'
|
||||
test_expect_success 'setup B1 lines (branch1)' '
|
||||
git checkout -b branch1 master &&
|
||||
echo "3A slow green fox jumps into the" >>file &&
|
||||
echo "well." >>file &&
|
||||
GIT_AUTHOR_NAME="B1" GIT_AUTHOR_EMAIL="B1@test.git" \
|
||||
git commit -a -m "Branch1-1"
|
||||
'
|
||||
|
||||
test_expect_success \
|
||||
'Two lines blamed on A, two on B, two on B1' \
|
||||
'check_count A 2 B 2 B1 2'
|
||||
test_expect_success 'blame 2 authors + 1 branch1 author' '
|
||||
check_count A 2 B 2 B1 2
|
||||
'
|
||||
|
||||
test_expect_success \
|
||||
'merge-setup part 2' \
|
||||
'git checkout -b branch2 master &&
|
||||
sed -e "s/2A quick brown/4A quick brown lazy dog/" < file > file.new &&
|
||||
mv file.new file &&
|
||||
GIT_AUTHOR_NAME="B2" GIT_AUTHOR_EMAIL="B2@test.git" git commit -a -m "Branch2-1"'
|
||||
test_expect_success 'setup B2 lines (branch2)' '
|
||||
git checkout -b branch2 master &&
|
||||
sed -e "s/2A quick brown/4A quick brown lazy dog/" <file >file.new &&
|
||||
mv file.new file &&
|
||||
GIT_AUTHOR_NAME="B2" GIT_AUTHOR_EMAIL="B2@test.git" \
|
||||
git commit -a -m "Branch2-1"
|
||||
'
|
||||
|
||||
test_expect_success \
|
||||
'Two lines blamed on A, one on B, one on B2' \
|
||||
'check_count A 2 B 1 B2 1'
|
||||
test_expect_success 'blame 2 authors + 1 branch2 author' '
|
||||
check_count A 2 B 1 B2 1
|
||||
'
|
||||
|
||||
test_expect_success \
|
||||
'merge-setup part 3' \
|
||||
'git pull . branch1'
|
||||
test_expect_success 'merge branch1 & branch2' '
|
||||
git pull . branch1
|
||||
'
|
||||
|
||||
test_expect_success \
|
||||
'Two lines blamed on A, one on B, two on B1, one on B2' \
|
||||
'check_count A 2 B 1 B1 2 B2 1'
|
||||
test_expect_success 'blame 2 authors + 2 merged-in authors' '
|
||||
check_count A 2 B 1 B1 2 B2 1
|
||||
'
|
||||
|
||||
test_expect_success \
|
||||
'Annotating an old revision works' \
|
||||
'check_count -h master A 2 B 2'
|
||||
test_expect_success 'blame ancestor' '
|
||||
check_count -h master A 2 B 2
|
||||
'
|
||||
|
||||
test_expect_success \
|
||||
'Annotating an old revision works' \
|
||||
'check_count -h master^ A 2'
|
||||
test_expect_success 'blame great-ancestor' '
|
||||
check_count -h master^ A 2
|
||||
'
|
||||
|
||||
test_expect_success \
|
||||
'merge-setup part 4' \
|
||||
'echo "evil merge." >>file &&
|
||||
git commit -a --amend'
|
||||
test_expect_success 'setup evil merge' '
|
||||
echo "evil merge." >>file &&
|
||||
git commit -a --amend
|
||||
'
|
||||
|
||||
test_expect_success \
|
||||
'Two lines blamed on A, one on B, two on B1, one on B2, one on A U Thor' \
|
||||
'check_count A 2 B 1 B1 2 B2 1 "A U Thor" 1'
|
||||
test_expect_success 'blame evil merge' '
|
||||
check_count A 2 B 1 B1 2 B2 1 "A U Thor" 1
|
||||
'
|
||||
|
||||
test_expect_success \
|
||||
'an incomplete line added' \
|
||||
'echo "incomplete" | tr -d "\\012" >>file &&
|
||||
GIT_AUTHOR_NAME="C" GIT_AUTHOR_EMAIL="C@test.git" git commit -a -m "Incomplete"'
|
||||
test_expect_success 'setup incomplete line' '
|
||||
echo "incomplete" | tr -d "\\012" >>file &&
|
||||
GIT_AUTHOR_NAME="C" GIT_AUTHOR_EMAIL="C@test.git" \
|
||||
git commit -a -m "Incomplete"
|
||||
'
|
||||
|
||||
test_expect_success \
|
||||
'With incomplete lines.' \
|
||||
'check_count A 2 B 1 B1 2 B2 1 "A U Thor" 1 C 1'
|
||||
test_expect_success 'blame incomplete line' '
|
||||
check_count A 2 B 1 B1 2 B2 1 "A U Thor" 1 C 1
|
||||
'
|
||||
|
||||
test_expect_success \
|
||||
'some edit' \
|
||||
'mv file file.orig &&
|
||||
{
|
||||
cat file.orig &&
|
||||
echo
|
||||
} | sed -e "s/^3A/99/" -e "/^1A/d" -e "/^incomplete/d" > file &&
|
||||
echo "incomplete" | tr -d "\\012" >>file &&
|
||||
GIT_AUTHOR_NAME="D" GIT_AUTHOR_EMAIL="D@test.git" git commit -a -m "edit"'
|
||||
test_expect_success 'setup edits' '
|
||||
mv file file.orig &&
|
||||
{
|
||||
cat file.orig &&
|
||||
echo
|
||||
} | sed -e "s/^3A/99/" -e "/^1A/d" -e "/^incomplete/d" >file &&
|
||||
echo "incomplete" | tr -d "\\012" >>file &&
|
||||
GIT_AUTHOR_NAME="D" GIT_AUTHOR_EMAIL="D@test.git" \
|
||||
git commit -a -m "edit"
|
||||
'
|
||||
|
||||
test_expect_success \
|
||||
'some edit' \
|
||||
'check_count A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1'
|
||||
test_expect_success 'blame edits' '
|
||||
check_count A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1
|
||||
'
|
||||
|
||||
test_expect_success \
|
||||
'an obfuscated email added' \
|
||||
'echo "No robots allowed" > file.new &&
|
||||
cat file >> file.new &&
|
||||
mv file.new file &&
|
||||
GIT_AUTHOR_NAME="E" GIT_AUTHOR_EMAIL="E at test dot git" git commit -a -m "norobots"'
|
||||
test_expect_success 'setup obfuscated email' '
|
||||
echo "No robots allowed" >file.new &&
|
||||
cat file >>file.new &&
|
||||
mv file.new file &&
|
||||
GIT_AUTHOR_NAME="E" GIT_AUTHOR_EMAIL="E at test dot git" \
|
||||
git commit -a -m "norobots"
|
||||
'
|
||||
|
||||
test_expect_success \
|
||||
'obfuscated email parsed' \
|
||||
'check_count A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1'
|
||||
test_expect_success 'blame obfuscated email' '
|
||||
check_count A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
|
||||
'
|
||||
|
|
|
|||
|
|
@ -6,9 +6,9 @@ test_description='git annotate'
|
|||
PROG='git annotate'
|
||||
. "$TEST_DIRECTORY"/annotate-tests.sh
|
||||
|
||||
test_expect_success 'Annotating an old revision works' '
|
||||
git annotate file master >result &&
|
||||
awk "{ print \$3; }" <result >authors &&
|
||||
test_expect_success 'annotate old revision' '
|
||||
git annotate file master >actual &&
|
||||
awk "{ print \$3; }" <actual >authors &&
|
||||
test 2 = $(grep A <authors | wc -l) &&
|
||||
test 2 = $(grep B <authors | wc -l)
|
||||
'
|
||||
|
|
|
|||
|
|
@ -7,8 +7,16 @@ PROG='git blame -c'
|
|||
. "$TEST_DIRECTORY"/annotate-tests.sh
|
||||
|
||||
PROG='git blame -c -e'
|
||||
test_expect_success 'Blame --show-email works' '
|
||||
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 '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_done
|
||||
|
|
|
|||
Loading…
Reference in a new issue