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
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
|
#!/usr/bin/env bash
. "$(dirname "$0")/testlib.sh"
setup_successful_repo () {
if [ "$1" != "--track-later" ]
then
git lfs track '*.dat'
else
touch .gitattributes
fi
seq 1 10 > a.dat
git add .gitattributes *.dat
git commit -m 'Initial import'
git checkout -b other
# sed -i isn't portable.
sed -e 's/9/B/' a.dat > b.dat
mv b.dat a.dat
git add -u
git commit -m 'B'
if [ "$1" = "--track-later" ]
then
git lfs track '*.dat'
git add .gitattributes
git commit -m 'B2'
fi
git checkout --force main
sed -e 's/2/A/' a.dat > b.dat
mv b.dat a.dat
git add -u
git commit -m 'A'
if [ "$1" = "--track-later" ]
then
git lfs track '*.dat'
git add -u
git commit -m 'A2'
fi
}
setup_custom_repo () {
git lfs track '*.dat'
seq 1 10 > a.dat
git add .gitattributes *.dat
git commit -m 'Initial import'
git checkout -b other
# sed -i isn't portable.
sed -e 's/2/B/' -e 's/9/B/' a.dat > b.dat
mv b.dat a.dat
git add -u
git commit -m 'B'
git checkout main
sed -e 's/2/A/' -e 's/9/A/' a.dat > b.dat
mv b.dat a.dat
git add -u
git commit -m 'A'
}
setup_conflicting_repo () {
if [ "$1" != "--track-later" ]
then
git lfs track '*.dat'
else
touch .gitattributes
fi
seq 1 10 > a.dat
git add .gitattributes *.dat
git commit -m 'Initial import'
git checkout -b other
# sed -i isn't portable.
sed -e 's/3/B/' a.dat > b.dat
mv b.dat a.dat
git add -u
git commit -m 'B'
if [ "$1" = "--track-later" ]
then
git lfs track '*.dat'
git add .gitattributes
git commit -m 'B2'
fi
git checkout --force main
sed -e 's/2/A/' a.dat > b.dat
mv b.dat a.dat
git add -u
git commit -m 'A'
if [ "$1" = "--track-later" ]
then
git lfs track '*.dat'
git add -u
git commit -m 'A2'
fi
}
begin_test "merge-driver uses Git merge by default"
(
set -e
reponame="merge-driver-basic"
git init "$reponame"
cd "$reponame"
result="07b26d7b3123467282635a68fdf9b59e81269cf9faf12282cedf30f393a55e5b"
git config merge.lfs.driver 'git lfs merge-driver --ancestor %O --current %A --other %B --marker-size %L --output %A'
setup_successful_repo
git merge other
(
set -
echo 1
echo A
seq 3 8
echo B
echo 10
) > expected.dat
diff -u a.dat expected.dat
assert_pointer "main" "a.dat" "$result" 21
assert_local_object "$result" 21
)
end_test
begin_test "merge-driver uses Git merge when explicit"
(
set -e
reponame="merge-driver-explicit"
git init "$reponame"
cd "$reponame"
result="07b26d7b3123467282635a68fdf9b59e81269cf9faf12282cedf30f393a55e5b"
git config merge.lfs.driver 'git lfs merge-driver --ancestor %O --current %A --other %B --marker-size %L --output %A --program '\''git merge-file --stdout --marker-size=%%L %%A %%O %%B >%%D'\'''
git lfs track '*.dat'
setup_successful_repo
git merge other
(
set -e
echo 1
echo A
seq 3 8
echo B
echo 10
) > expected.dat
diff -u a.dat expected.dat
assert_pointer "main" "a.dat" "$result" 21
assert_local_object "$result" 21
)
end_test
begin_test "merge-driver uses custom driver when explicit"
(
set -e
reponame="merge-driver-custom"
git init "$reponame"
cd "$reponame"
result="07b26d7b3123467282635a68fdf9b59e81269cf9faf12282cedf30f393a55e5b"
git config merge.lfs.driver 'git lfs merge-driver --ancestor %O --current %A --other %B --marker-size %L --output %A --program '\''(sed -n 1,5p %%A; sed -n 6,10p %%B) >%%D'\'''
git lfs track '*.dat'
setup_custom_repo
git merge other
(
set -e
echo 1
echo A
seq 3 8
echo B
echo 10
) > expected.dat
diff -u a.dat expected.dat
assert_pointer "main" "a.dat" "$result" 21
assert_local_object "$result" 21
)
end_test
begin_test "merge-driver reports conflicts"
(
set -e
reponame="merge-driver-conflicts"
git init "$reponame"
cd "$reponame"
git config merge.lfs.driver 'git lfs merge-driver --ancestor %O --current %A --other %B --marker-size %L --output %A --program '\''git merge-file --stdout --marker-size=%%L %%A %%O %%B >%%D'\'''
git lfs track '*.dat'
setup_conflicting_repo
git merge other && exit 1
sed -e 's/<<<<<<<.*/<<<<<<</' -e 's/>>>>>>>.*/>>>>>>>/' a.dat > actual.dat
(
set -e
echo 1
echo "<<<<<<<"
echo A
echo 3
echo "======="
echo 2
echo B
echo ">>>>>>>"
seq 4 10
) > expected.dat
diff -u actual.dat expected.dat
)
end_test
begin_test "merge-driver gracefully handles non-pointer"
(
set -e
reponame="merge-driver-non-pointer"
git init "$reponame"
cd "$reponame"
result="07b26d7b3123467282635a68fdf9b59e81269cf9faf12282cedf30f393a55e5b"
git config merge.lfs.driver 'git lfs merge-driver --ancestor %O --current %A --other %B --marker-size %L --output %A'
setup_successful_repo --track-later
git merge other
(
set -
echo 1
echo A
seq 3 8
echo B
echo 10
) > expected.dat
diff -u a.dat expected.dat
assert_pointer "main" "a.dat" "$result" 21
assert_local_object "$result" 21
)
end_test
begin_test "merge-driver reports conflicts with non-pointer"
(
set -e
reponame="conflicts-non-pointer"
git init "$reponame"
cd "$reponame"
git config merge.lfs.driver 'git lfs merge-driver --ancestor %O --current %A --other %B --marker-size %L --output %A --program '\''git merge-file --stdout --marker-size=%%L %%A %%O %%B >%%D'\'''
setup_conflicting_repo --track-later
git merge other && exit 1
sed -e 's/<<<<<<<.*/<<<<<<</' -e 's/>>>>>>>.*/>>>>>>>/' a.dat > actual.dat
(
set -e
echo 1
echo "<<<<<<<"
echo A
echo 3
echo "======="
echo 2
echo B
echo ">>>>>>>"
seq 4 10
) > expected.dat
diff -u actual.dat expected.dat
)
end_test
|
