1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
|
# This file isn't used as a test script directly, instead it is
# sourced from t8001-annotate.sh and t8001-blame.sh.
check_count () {
head=
case "$1" in -h) head="$2"; shift; shift ;; esac
$PROG file $head | perl -e '
my %expect = (@ARGV);
my %count = ();
while (<STDIN>) {
if (/^[0-9a-f]+\t\(([^\t]+)\t/) {
my $author = $1;
for ($author) { s/^\s*//; s/\s*$//; }
if (exists $expect{$author}) {
$count{$author}++;
}
}
}
my $bad = 0;
while (my ($author, $count) = each %count) {
my $ok;
if ($expect{$author} != $count) {
$bad = 1;
$ok = "bad";
}
else {
$ok = "good";
}
print STDERR "Author $author (expected $expect{$author}, attributed $count) $ok\n";
}
exit($bad);
' "$@"
}
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' \
'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 commit -a -m "Second."'
test_expect_success \
'Two lines blamed on A, two on B' \
'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 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 \
'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 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 \
'merge-setup part 3' \
'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 \
'Annotating an old revision works' \
'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 \
'merge-setup part 4' \
'echo "evil merge." >>file &&
EDITOR=: VISUAL=: 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 \
'an incomplete line added' \
'echo "incomplete" | tr -d "\\012" >>file &&
GIT_AUTHOR_NAME="C" 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 \
'some edit' \
'perl -pi -e "s/^1A.*\n$//; s/^3A/99/" file &&
GIT_AUTHOR_NAME="D" 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'
|
