blob: 9e8fe38e7ef94b7343122b279c94c250dcf48756 (
plain) (
blame)
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
|
#!/bin/sh
test_description='git svn authorship'
. ./lib-git-svn.sh
test_expect_success 'setup svn repository' '
svn_cmd checkout "$svnrepo" work.svn &&
(
cd work.svn &&
echo >file &&
svn_cmd add file &&
svn_cmd commit -m "first commit" file
)
'
test_expect_success 'interact with it via git svn' '
mkdir work.git &&
(
cd work.git &&
git svn init "$svnrepo" &&
git svn fetch &&
echo modification >file &&
test_tick &&
git commit -a -m second &&
test_tick &&
git svn dcommit &&
echo "further modification" >file &&
test_tick &&
git commit -a -m third &&
test_tick &&
git svn --add-author-from dcommit &&
echo "yet further modification" >file &&
test_tick &&
git commit -a -m fourth &&
test_tick &&
git svn --add-author-from --use-log-author dcommit &&
git log &&
git show -s HEAD^^ >../actual.2 &&
git show -s HEAD^ >../actual.3 &&
git show -s HEAD >../actual.4
) &&
# Make sure that --add-author-from without --use-log-author
# did not affect the authorship information
myself=$(grep "^Author: " actual.2) &&
unaffected=$(grep "^Author: " actual.3) &&
test "z$myself" = "z$unaffected" &&
# Make sure lack of --add-author-from did not add cruft
! grep "^ From: A U Thor " actual.2 &&
# Make sure --add-author-from added cruft
grep "^ From: A U Thor " actual.3 &&
grep "^ From: A U Thor " actual.4 &&
# Make sure --add-author-from with --use-log-author affected
# the authorship information
grep "^Author: A U Thor " actual.4 &&
# Make sure there are no commit messages with excess blank lines
test $(grep "^ " actual.2 | wc -l) = 3 &&
test $(grep "^ " actual.3 | wc -l) = 5 &&
test $(grep "^ " actual.4 | wc -l) = 5 &&
# Make sure there are no svn commit messages with excess blank lines
(
cd work.svn &&
svn_cmd up &&
test $(svn_cmd log -r2:2 | wc -l) = 5 &&
test $(svn_cmd log -r4:4 | wc -l) = 7
)
'
test_done
|
