mirror of
https://github.com/git/git.git
synced 2024-11-18 06:54:55 +01:00
7c3ecb65ee
Signed-off-by: Ryan Anderson <ryan@michonline.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
89 lines
2.6 KiB
Bash
Executable file
89 lines
2.6 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='git-annotate'
|
|
. ./test-lib.sh
|
|
|
|
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 commit -a -m "Initial."'
|
|
|
|
test_expect_success \
|
|
'check all lines blamed on A' \
|
|
'[ $(git annotate file | awk "{print \$3}" | grep -c "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 commit -a -m "Second."'
|
|
|
|
test_expect_success \
|
|
'Two lines blamed on A' \
|
|
'[ $(git annotate file | awk "{print \$3}" | grep -c "A") == 2 ]'
|
|
|
|
test_expect_success \
|
|
'Two lines blamed on B' \
|
|
'[ $(git annotate file | awk "{print \$3}" | grep -c "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 commit -a -m "Branch1-1"'
|
|
|
|
test_expect_success \
|
|
'Two lines blamed on A' \
|
|
'[ $(git annotate file | awk "{print \$3}" | grep -c "^A$") == 2 ]'
|
|
|
|
test_expect_success \
|
|
'Two lines blamed on B' \
|
|
'[ $(git annotate file | awk "{print \$3}" | grep -c "^B$") == 2 ]'
|
|
|
|
test_expect_success \
|
|
'Two lines blamed on B1' \
|
|
'[ $(git annotate file | awk "{print \$3}" | grep -c "^B1$") == 2 ]'
|
|
|
|
test_expect_success \
|
|
'merge-setup part 2' \
|
|
'git checkout -b branch2 master &&
|
|
sed -i -e "s/2A quick brown/4A quick brown lazy dog/" file &&
|
|
GIT_AUTHOR_NAME="B2" git commit -a -m "Branch2-1"'
|
|
|
|
test_expect_success \
|
|
'Two lines blamed on A' \
|
|
'[ $(git annotate file | awk "{print \$3}" | grep -c "^A$") == 2 ]'
|
|
|
|
test_expect_success \
|
|
'One line blamed on B' \
|
|
'[ $(git annotate file | awk "{print \$3}" | grep -c "^B$") == 1 ]'
|
|
|
|
test_expect_success \
|
|
'One line blamed on B2' \
|
|
'[ $(git annotate file | awk "{print \$3}" | grep -c "^B2$") == 1 ]'
|
|
|
|
|
|
test_expect_success \
|
|
'merge-setup part 3' \
|
|
'git pull . branch1'
|
|
|
|
test_expect_success \
|
|
'Two lines blamed on A' \
|
|
'[ $(git annotate file | awk "{print \$3}" | grep -c "^A$") == 2 ]'
|
|
|
|
test_expect_success \
|
|
'One line blamed on B' \
|
|
'[ $(git annotate file | awk "{print \$3}" | grep -c "^B$") == 1 ]'
|
|
|
|
test_expect_success \
|
|
'Two lines blamed on B1' \
|
|
'[ $(git annotate file | awk "{print \$3}" | grep -c "^B1$") == 2 ]'
|
|
|
|
test_expect_success \
|
|
'One line blamed on B2' \
|
|
'[ $(git annotate file | awk "{print \$3}" | grep -c "^B2$") == 1 ]'
|
|
|
|
test_done
|