blob: 8f5a06f7dd8383722022eb7a8abd0ff9bafa6f45 (
plain)
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
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
|
#!/bin/sh
#
# Copyright (c) 2006, Junio C Hamano
#
test_description='fmt-merge-msg test'
. ./test-lib.sh
datestamp=1151939923
setdate () {
GIT_COMMITTER_DATE="$datestamp +0200"
GIT_AUTHOR_DATE="$datestamp +0200"
datestamp=`expr "$datestamp" + 1`
export GIT_COMMITTER_DATE GIT_AUTHOR_DATE
}
test_expect_success setup '
echo one >one &&
git add one &&
setdate &&
git commit -m "Initial" &&
echo uno >one &&
echo dos >two &&
git add two &&
setdate &&
git commit -a -m "Second" &&
git checkout -b left &&
echo $datestamp >one &&
setdate &&
git commit -a -m "Common #1" &&
echo $datestamp >one &&
setdate &&
git commit -a -m "Common #2" &&
git branch right &&
echo $datestamp >two &&
setdate &&
git commit -a -m "Left #3" &&
echo $datestamp >two &&
setdate &&
git commit -a -m "Left #4" &&
echo $datestamp >two &&
setdate &&
git commit -a -m "Left #5" &&
git checkout right &&
echo $datestamp >three &&
git add three &&
setdate &&
git commit -a -m "Right #3" &&
echo $datestamp >three &&
setdate &&
git commit -a -m "Right #4" &&
echo $datestamp >three &&
setdate &&
git commit -a -m "Right #5" &&
git show-branch
'
cat >expected <<\EOF
Merge branch 'left'
EOF
test_expect_success 'merge-msg test #1' '
git checkout master &&
git fetch . left &&
git fmt-merge-msg <.git/FETCH_HEAD >actual &&
test_cmp expected actual
'
cat >expected <<EOF
Merge branch 'left' of $TEST_DIRECTORY/$test
EOF
test_expect_success 'merge-msg test #2' '
git checkout master &&
git fetch "$TEST_DIRECTORY/$test" left &&
git fmt-merge-msg <.git/FETCH_HEAD >actual &&
test_cmp expected actual
'
cat >expected <<\EOF
Merge branch 'left'
* left:
Left #5
Left #4
Left #3
Common #2
Common #1
EOF
test_expect_success 'merge-msg test #3-1' '
git config --unset-all merge.log
git config --unset-all merge.summary
git config merge.log true &&
git checkout master &&
setdate &&
git fetch . left &&
git fmt-merge-msg <.git/FETCH_HEAD >actual &&
test_cmp expected actual
'
test_expect_success 'merge-msg test #3-2' '
git config --unset-all merge.log
git config --unset-all merge.summary
git config merge.summary true &&
git checkout master &&
setdate &&
git fetch . left &&
git fmt-merge-msg <.git/FETCH_HEAD >actual &&
test_cmp expected actual
'
cat >expected <<\EOF
Merge branches 'left' and 'right'
* left:
Left #5
Left #4
Left #3
Common #2
Common #1
* right:
Right #5
Right #4
Right #3
Common #2
Common #1
EOF
test_expect_success 'merge-msg test #4-1' '
git config --unset-all merge.log
git config --unset-all merge.summary
git config merge.log true &&
git checkout master &&
setdate &&
git fetch . left right &&
git fmt-merge-msg <.git/FETCH_HEAD >actual &&
test_cmp expected actual
'
test_expect_success 'merge-msg test #4-2' '
git config --unset-all merge.log
git config --unset-all merge.summary
git config merge.summary true &&
git checkout master &&
setdate &&
git fetch . left right &&
git fmt-merge-msg <.git/FETCH_HEAD >actual &&
test_cmp expected actual
'
test_expect_success 'merge-msg test #5-1' '
git config --unset-all merge.log
git config --unset-all merge.summary
git config merge.log yes &&
git checkout master &&
setdate &&
git fetch . left right &&
git fmt-merge-msg <.git/FETCH_HEAD >actual &&
test_cmp expected actual
'
test_expect_success 'merge-msg test #5-2' '
git config --unset-all merge.log
git config --unset-all merge.summary
git config merge.summary yes &&
git checkout master &&
setdate &&
git fetch . left right &&
git fmt-merge-msg <.git/FETCH_HEAD >actual &&
test_cmp expected actual
'
test_done
|
