CodingGuidelines: do not ==/!= compare with 0 or '\0' or NULL
[git.git] / t / t3309-notes-merge-auto-resolve.sh
blob141d3e4ca4dc49181b31aff8a540a551ce8e4805
1 #!/bin/sh
3 # Copyright (c) 2010 Johan Herland
6 test_description='Test notes merging with auto-resolving strategies'
8 . ./test-lib.sh
10 # Set up a notes merge scenario with all kinds of potential conflicts
11 test_expect_success 'setup commits' '
12 test_commit 1st &&
13 test_commit 2nd &&
14 test_commit 3rd &&
15 test_commit 4th &&
16 test_commit 5th &&
17 test_commit 6th &&
18 test_commit 7th &&
19 test_commit 8th &&
20 test_commit 9th &&
21 test_commit 10th &&
22 test_commit 11th &&
23 test_commit 12th &&
24 test_commit 13th &&
25 test_commit 14th &&
26 test_commit 15th &&
28 test_oid_cache <<-EOF
29 hash15a sha1:457a85d6c814ea208550f15fcc48f804ac8dc023
30 hash14a sha1:b0c95b954301d69da2bc3723f4cb1680d355937c
31 hash13a sha1:5d30216a129eeffa97d9694ffe8c74317a560315
32 hash12a sha1:dd161bc149470fd890dd4ab52a4cbd79bbd18c36
33 hash11a sha1:7abbc45126d680336fb24294f013a7cdfa3ed545
34 hash10a sha1:b8d03e173f67f6505a76f6e00cf93440200dd9be
35 hash09a sha1:20c613c835011c48a5abe29170a2402ca6354910
36 hash08a sha1:a3daf8a1e4e5dc3409a303ad8481d57bfea7f5d6
37 hash07a sha1:897003322b53bc6ca098e9324ee508362347e734
38 hash06a sha1:11d97fdebfa5ceee540a3da07bce6fa0222bc082
39 hash15b sha1:68b8630d25516028bed862719855b3d6768d7833
40 hash14b sha1:5de7ea7ad4f47e7ff91989fb82234634730f75df
41 hash13b sha1:3a631fdb6f41b05b55d8f4baf20728ba8f6fccbc
42 hash12b sha1:a66055fa82f7a03fe0c02a6aba3287a85abf7c62
43 hash05b sha1:154508c7a0bcad82b6fe4b472bc4c26b3bf0825b
44 hash04b sha1:e2bfd06a37dd2031684a59a6e2b033e212239c78
45 hash03b sha1:5772f42408c0dd6f097a7ca2d24de0e78d1c46b1
46 hash15c sha1:9b4b2c61f0615412da3c10f98ff85b57c04ec765
47 hash11c sha1:7e3c53503a3db8dd996cb62e37c66e070b44b54d
48 hash08c sha1:851e1638784a884c7dd26c5d41f3340f6387413a
49 hash05c sha1:99fc34adfc400b95c67b013115e37e31aa9a6d23
50 hash02c sha1:283b48219aee9a4105f6cab337e789065c82c2b9
51 hash15d sha1:7c4e546efd0fe939f876beb262ece02797880b54
52 hash05d sha1:6c841cc36ea496027290967ca96bd2bef54dbb47
53 hash15e sha1:d682107b8bf7a7aea1e537a8d5cb6a12b60135f1
54 hash05e sha1:357b6ca14c7afd59b7f8b8aaaa6b8b723771135b
55 hash15f sha1:6be90240b5f54594203e25d9f2f64b7567175aee
56 hash05f sha1:660311d7f78dc53db12ac373a43fca7465381a7e
58 hash15a sha256:45b1558e5c1b75f570010fa48aaa67bb2289fcd431b34ad81cb4c8b95f4f872a
59 hash14a sha256:6e7af179ea4dd28afdc83ae6912ba0098cdeff764b26a8b750b157dd81749092
60 hash13a sha256:7353089961baf555388e1bac68c67c8ea94b08ccbd97532201cf7f6790703052
61 hash12a sha256:5863e4521689ee1879ceab3b38d39e93ab5b51ec70aaf6a96ad388fbdedfa25e
62 hash11a sha256:82a0ec0338b4ecf8b44304badf4ad38d7469dc41827f38d7ba6c42e3bae3ee98
63 hash10a sha256:e84f2564e92de9792c93b8d197262c735d7ccb1de6025cef8759af8f6c3308eb
64 hash09a sha256:4dd07764bcec696f195c0ea71ae89e174876403af1637e4642b8f4453fd23028
65 hash08a sha256:02132c4546cd88a1d0aa5854dd55da120927f7904ba16afe36fe03e91a622067
66 hash07a sha256:369baf7d00c6720efdc10273493555f943051f84a4706fb24caeb353fa4789db
67 hash06a sha256:52d32c10353583b2d96a5849b1f1f43c8018e76f3e8ef1b0d46eb5cff7cdefaf
68 hash15b sha256:345e6660b345fa174738a31a7a59423c394bdf414804e200bc510c65d971ae96
69 hash14b sha256:7653a6596021c52e405cba979eea15a729993e7102b9a61ba4667e34f0ead4a1
70 hash13b sha256:0f202a0b6b9690de2349c173dfd766a37e82744f61c14f1c389306f1d69f470b
71 hash12b sha256:eb00f219c026136ea6535b16ff8ec3efa510e6bf50098ca041e1a2a1d4b79840
72 hash05b sha256:993b2290cd0c24c27c849d99f1904f3b590f77af0f539932734ad05679ac5a2f
73 hash04b sha256:c7fba0d6104917fbf35258f40b9fa4fc697cfa992deecd1570a3b08d0a5587a9
74 hash03b sha256:7287a2d78a3766c181b08df38951d784b08b72a44f571ed6d855bd0be22c70f6
75 hash15c sha256:62316660a22bf97857dc4a16709ec4d93a224e8c9f37d661ef91751e1f4c4166
76 hash11c sha256:51c3763de9b08309370adc5036d58debb331980e73097902957c444602551daa
77 hash08c sha256:22cf1fa29599898a7218c51135d66ed85d22aad584f77db3305dedce4c3d4798
78 hash05c sha256:2508fd86db980f0508893a1c1571bdf3b2ee113dc25ddb1a3a2fb94bd6cd0d58
79 hash02c sha256:63bb527e0b4e1c8e1dd0d54dd778ca7c3718689fd6e37c473044cfbcf1cacfdb
80 hash15d sha256:667acb4e2d5f8df15e5aea4506dfd16d25bc7feca70fdb0d965a7222f983bb88
81 hash05d sha256:09e6b5a6fe666c4a027674b6611a254b7d2528cd211c6b5288d1b4db6c741dfa
82 hash15e sha256:e8cbf52f6fcadc6de3c7761e64a89e9fe38d19a03d3e28ef6ca8596d93fc4f3a
83 hash05e sha256:cdb1e19f7ba1539f95af51a57edeb88a7ecc97d3c2f52da8c4c86af308595607
84 hash15f sha256:29c14cb92da448a923963b8a43994268b19c2e57913de73f3667421fd2c0eeec
85 hash05f sha256:14a6e641b2c0a9f398ebac6b4d34afa5efea4c52d2631382f45f8f662266903b
86 EOF
89 commit_sha1=$(git rev-parse 1st^{commit})
90 commit_sha2=$(git rev-parse 2nd^{commit})
91 commit_sha3=$(git rev-parse 3rd^{commit})
92 commit_sha4=$(git rev-parse 4th^{commit})
93 commit_sha5=$(git rev-parse 5th^{commit})
94 commit_sha6=$(git rev-parse 6th^{commit})
95 commit_sha7=$(git rev-parse 7th^{commit})
96 commit_sha8=$(git rev-parse 8th^{commit})
97 commit_sha9=$(git rev-parse 9th^{commit})
98 commit_sha10=$(git rev-parse 10th^{commit})
99 commit_sha11=$(git rev-parse 11th^{commit})
100 commit_sha12=$(git rev-parse 12th^{commit})
101 commit_sha13=$(git rev-parse 13th^{commit})
102 commit_sha14=$(git rev-parse 14th^{commit})
103 commit_sha15=$(git rev-parse 15th^{commit})
105 verify_notes () {
106 notes_ref="$1"
107 suffix="$2"
108 git -c core.notesRef="refs/notes/$notes_ref" notes |
109 sort >"output_notes_$suffix" &&
110 test_cmp "expect_notes_$suffix" "output_notes_$suffix" &&
111 git -c core.notesRef="refs/notes/$notes_ref" log --format="%H %s%n%N" \
112 >"output_log_$suffix" &&
113 test_cmp "expect_log_$suffix" "output_log_$suffix"
116 test_expect_success 'setup merge base (x)' '
117 git config core.notesRef refs/notes/x &&
118 git notes add -m "x notes on 6th commit" 6th &&
119 git notes add -m "x notes on 7th commit" 7th &&
120 git notes add -m "x notes on 8th commit" 8th &&
121 git notes add -m "x notes on 9th commit" 9th &&
122 git notes add -m "x notes on 10th commit" 10th &&
123 git notes add -m "x notes on 11th commit" 11th &&
124 git notes add -m "x notes on 12th commit" 12th &&
125 git notes add -m "x notes on 13th commit" 13th &&
126 git notes add -m "x notes on 14th commit" 14th &&
127 git notes add -m "x notes on 15th commit" 15th
130 cat <<EOF | sort >expect_notes_x
131 $(test_oid hash15a) $commit_sha15
132 $(test_oid hash14a) $commit_sha14
133 $(test_oid hash13a) $commit_sha13
134 $(test_oid hash12a) $commit_sha12
135 $(test_oid hash11a) $commit_sha11
136 $(test_oid hash10a) $commit_sha10
137 $(test_oid hash09a) $commit_sha9
138 $(test_oid hash08a) $commit_sha8
139 $(test_oid hash07a) $commit_sha7
140 $(test_oid hash06a) $commit_sha6
143 cat >expect_log_x <<EOF
144 $commit_sha15 15th
145 x notes on 15th commit
147 $commit_sha14 14th
148 x notes on 14th commit
150 $commit_sha13 13th
151 x notes on 13th commit
153 $commit_sha12 12th
154 x notes on 12th commit
156 $commit_sha11 11th
157 x notes on 11th commit
159 $commit_sha10 10th
160 x notes on 10th commit
162 $commit_sha9 9th
163 x notes on 9th commit
165 $commit_sha8 8th
166 x notes on 8th commit
168 $commit_sha7 7th
169 x notes on 7th commit
171 $commit_sha6 6th
172 x notes on 6th commit
174 $commit_sha5 5th
176 $commit_sha4 4th
178 $commit_sha3 3rd
180 $commit_sha2 2nd
182 $commit_sha1 1st
186 test_expect_success 'verify state of merge base (x)' 'verify_notes x x'
188 test_expect_success 'setup local branch (y)' '
189 git update-ref refs/notes/y refs/notes/x &&
190 git config core.notesRef refs/notes/y &&
191 git notes add -f -m "y notes on 3rd commit" 3rd &&
192 git notes add -f -m "y notes on 4th commit" 4th &&
193 git notes add -f -m "y notes on 5th commit" 5th &&
194 git notes remove 6th &&
195 git notes remove 7th &&
196 git notes remove 8th &&
197 git notes add -f -m "y notes on 12th commit" 12th &&
198 git notes add -f -m "y notes on 13th commit" 13th &&
199 git notes add -f -m "y notes on 14th commit" 14th &&
200 git notes add -f -m "y notes on 15th commit" 15th
203 cat <<EOF | sort >expect_notes_y
204 $(test_oid hash15b) $commit_sha15
205 $(test_oid hash14b) $commit_sha14
206 $(test_oid hash13b) $commit_sha13
207 $(test_oid hash12b) $commit_sha12
208 $(test_oid hash11a) $commit_sha11
209 $(test_oid hash10a) $commit_sha10
210 $(test_oid hash09a) $commit_sha9
211 $(test_oid hash05b) $commit_sha5
212 $(test_oid hash04b) $commit_sha4
213 $(test_oid hash03b) $commit_sha3
216 cat >expect_log_y <<EOF
217 $commit_sha15 15th
218 y notes on 15th commit
220 $commit_sha14 14th
221 y notes on 14th commit
223 $commit_sha13 13th
224 y notes on 13th commit
226 $commit_sha12 12th
227 y notes on 12th commit
229 $commit_sha11 11th
230 x notes on 11th commit
232 $commit_sha10 10th
233 x notes on 10th commit
235 $commit_sha9 9th
236 x notes on 9th commit
238 $commit_sha8 8th
240 $commit_sha7 7th
242 $commit_sha6 6th
244 $commit_sha5 5th
245 y notes on 5th commit
247 $commit_sha4 4th
248 y notes on 4th commit
250 $commit_sha3 3rd
251 y notes on 3rd commit
253 $commit_sha2 2nd
255 $commit_sha1 1st
259 test_expect_success 'verify state of local branch (y)' 'verify_notes y y'
261 test_expect_success 'setup remote branch (z)' '
262 git update-ref refs/notes/z refs/notes/x &&
263 git config core.notesRef refs/notes/z &&
264 git notes add -f -m "z notes on 2nd commit" 2nd &&
265 git notes add -f -m "y notes on 4th commit" 4th &&
266 git notes add -f -m "z notes on 5th commit" 5th &&
267 git notes remove 6th &&
268 git notes add -f -m "z notes on 8th commit" 8th &&
269 git notes remove 9th &&
270 git notes add -f -m "z notes on 11th commit" 11th &&
271 git notes remove 12th &&
272 git notes add -f -m "y notes on 14th commit" 14th &&
273 git notes add -f -m "z notes on 15th commit" 15th
276 cat <<EOF | sort >expect_notes_z
277 $(test_oid hash15c) $commit_sha15
278 $(test_oid hash14b) $commit_sha14
279 $(test_oid hash13a) $commit_sha13
280 $(test_oid hash11c) $commit_sha11
281 $(test_oid hash10a) $commit_sha10
282 $(test_oid hash08c) $commit_sha8
283 $(test_oid hash07a) $commit_sha7
284 $(test_oid hash05c) $commit_sha5
285 $(test_oid hash04b) $commit_sha4
286 $(test_oid hash02c) $commit_sha2
289 cat >expect_log_z <<EOF
290 $commit_sha15 15th
291 z notes on 15th commit
293 $commit_sha14 14th
294 y notes on 14th commit
296 $commit_sha13 13th
297 x notes on 13th commit
299 $commit_sha12 12th
301 $commit_sha11 11th
302 z notes on 11th commit
304 $commit_sha10 10th
305 x notes on 10th commit
307 $commit_sha9 9th
309 $commit_sha8 8th
310 z notes on 8th commit
312 $commit_sha7 7th
313 x notes on 7th commit
315 $commit_sha6 6th
317 $commit_sha5 5th
318 z notes on 5th commit
320 $commit_sha4 4th
321 y notes on 4th commit
323 $commit_sha3 3rd
325 $commit_sha2 2nd
326 z notes on 2nd commit
328 $commit_sha1 1st
332 test_expect_success 'verify state of remote branch (z)' 'verify_notes z z'
334 # At this point, before merging z into y, we have the following status:
336 # commit | base/x | local/y | remote/z | diff from x to y/z | result
337 # -------|---------|---------|----------|----------------------------|-------
338 # 1st | [none] | [none] | [none] | unchanged / unchanged | [none]
339 # 2nd | [none] | [none] | 283b482 | unchanged / added | 283b482
340 # 3rd | [none] | 5772f42 | [none] | added / unchanged | 5772f42
341 # 4th | [none] | e2bfd06 | e2bfd06 | added / added (same) | e2bfd06
342 # 5th | [none] | 154508c | 99fc34a | added / added (diff) | ???
343 # 6th | 11d97fd | [none] | [none] | removed / removed | [none]
344 # 7th | 8970033 | [none] | 8970033 | removed / unchanged | [none]
345 # 8th | a3daf8a | [none] | 851e163 | removed / changed | ???
346 # 9th | 20c613c | 20c613c | [none] | unchanged / removed | [none]
347 # 10th | b8d03e1 | b8d03e1 | b8d03e1 | unchanged / unchanged | b8d03e1
348 # 11th | 7abbc45 | 7abbc45 | 7e3c535 | unchanged / changed | 7e3c535
349 # 12th | dd161bc | a66055f | [none] | changed / removed | ???
350 # 13th | 5d30216 | 3a631fd | 5d30216 | changed / unchanged | 3a631fd
351 # 14th | b0c95b9 | 5de7ea7 | 5de7ea7 | changed / changed (same) | 5de7ea7
352 # 15th | 457a85d | 68b8630 | 9b4b2c6 | changed / changed (diff) | ???
354 test_expect_success 'merge z into y with invalid strategy => Fail/No changes' '
355 git config core.notesRef refs/notes/y &&
356 test_must_fail git notes merge --strategy=foo z &&
357 # Verify no changes (y)
358 verify_notes y y
361 test_expect_success 'merge z into y with invalid configuration option => Fail/No changes' '
362 git config core.notesRef refs/notes/y &&
363 test_must_fail git -c notes.mergeStrategy="foo" notes merge z &&
364 # Verify no changes (y)
365 verify_notes y y
368 cat <<EOF | sort >expect_notes_ours
369 $(test_oid hash15b) $commit_sha15
370 $(test_oid hash14b) $commit_sha14
371 $(test_oid hash13b) $commit_sha13
372 $(test_oid hash12b) $commit_sha12
373 $(test_oid hash11c) $commit_sha11
374 $(test_oid hash10a) $commit_sha10
375 $(test_oid hash05b) $commit_sha5
376 $(test_oid hash04b) $commit_sha4
377 $(test_oid hash03b) $commit_sha3
378 $(test_oid hash02c) $commit_sha2
381 cat >expect_log_ours <<EOF
382 $commit_sha15 15th
383 y notes on 15th commit
385 $commit_sha14 14th
386 y notes on 14th commit
388 $commit_sha13 13th
389 y notes on 13th commit
391 $commit_sha12 12th
392 y notes on 12th commit
394 $commit_sha11 11th
395 z notes on 11th commit
397 $commit_sha10 10th
398 x notes on 10th commit
400 $commit_sha9 9th
402 $commit_sha8 8th
404 $commit_sha7 7th
406 $commit_sha6 6th
408 $commit_sha5 5th
409 y notes on 5th commit
411 $commit_sha4 4th
412 y notes on 4th commit
414 $commit_sha3 3rd
415 y notes on 3rd commit
417 $commit_sha2 2nd
418 z notes on 2nd commit
420 $commit_sha1 1st
424 test_expect_success 'merge z into y with "ours" strategy => Non-conflicting 3-way merge' '
425 git notes merge --strategy=ours z &&
426 verify_notes y ours
429 test_expect_success 'reset to pre-merge state (y)' '
430 git update-ref refs/notes/y refs/notes/y^1 &&
431 # Verify pre-merge state
432 verify_notes y y
435 test_expect_success 'merge z into y with "ours" configuration option => Non-conflicting 3-way merge' '
436 git -c notes.mergeStrategy="ours" notes merge z &&
437 verify_notes y ours
440 test_expect_success 'reset to pre-merge state (y)' '
441 git update-ref refs/notes/y refs/notes/y^1 &&
442 # Verify pre-merge state
443 verify_notes y y
446 test_expect_success 'merge z into y with "ours" per-ref configuration option => Non-conflicting 3-way merge' '
447 git -c notes.y.mergeStrategy="ours" notes merge z &&
448 verify_notes y ours
451 test_expect_success 'reset to pre-merge state (y)' '
452 git update-ref refs/notes/y refs/notes/y^1 &&
453 # Verify pre-merge state
454 verify_notes y y
457 cat <<EOF | sort >expect_notes_theirs
458 $(test_oid hash15c) $commit_sha15
459 $(test_oid hash14b) $commit_sha14
460 $(test_oid hash13b) $commit_sha13
461 $(test_oid hash11c) $commit_sha11
462 $(test_oid hash10a) $commit_sha10
463 $(test_oid hash08c) $commit_sha8
464 $(test_oid hash05c) $commit_sha5
465 $(test_oid hash04b) $commit_sha4
466 $(test_oid hash03b) $commit_sha3
467 $(test_oid hash02c) $commit_sha2
470 cat >expect_log_theirs <<EOF
471 $commit_sha15 15th
472 z notes on 15th commit
474 $commit_sha14 14th
475 y notes on 14th commit
477 $commit_sha13 13th
478 y notes on 13th commit
480 $commit_sha12 12th
482 $commit_sha11 11th
483 z notes on 11th commit
485 $commit_sha10 10th
486 x notes on 10th commit
488 $commit_sha9 9th
490 $commit_sha8 8th
491 z notes on 8th commit
493 $commit_sha7 7th
495 $commit_sha6 6th
497 $commit_sha5 5th
498 z notes on 5th commit
500 $commit_sha4 4th
501 y notes on 4th commit
503 $commit_sha3 3rd
504 y notes on 3rd commit
506 $commit_sha2 2nd
507 z notes on 2nd commit
509 $commit_sha1 1st
513 test_expect_success 'merge z into y with "theirs" strategy => Non-conflicting 3-way merge' '
514 git notes merge --strategy=theirs z &&
515 verify_notes y theirs
518 test_expect_success 'reset to pre-merge state (y)' '
519 git update-ref refs/notes/y refs/notes/y^1 &&
520 # Verify pre-merge state
521 verify_notes y y
524 test_expect_success 'merge z into y with "theirs" strategy overriding configuration option "ours" => Non-conflicting 3-way merge' '
525 git -c notes.mergeStrategy="ours" notes merge --strategy=theirs z &&
526 verify_notes y theirs
529 test_expect_success 'reset to pre-merge state (y)' '
530 git update-ref refs/notes/y refs/notes/y^1 &&
531 # Verify pre-merge state
532 verify_notes y y
535 cat <<EOF | sort >expect_notes_union
536 $(test_oid hash15d) $commit_sha15
537 $(test_oid hash14b) $commit_sha14
538 $(test_oid hash13b) $commit_sha13
539 $(test_oid hash12b) $commit_sha12
540 $(test_oid hash11c) $commit_sha11
541 $(test_oid hash10a) $commit_sha10
542 $(test_oid hash08c) $commit_sha8
543 $(test_oid hash05d) $commit_sha5
544 $(test_oid hash04b) $commit_sha4
545 $(test_oid hash03b) $commit_sha3
546 $(test_oid hash02c) $commit_sha2
549 cat >expect_log_union <<EOF
550 $commit_sha15 15th
551 y notes on 15th commit
553 z notes on 15th commit
555 $commit_sha14 14th
556 y notes on 14th commit
558 $commit_sha13 13th
559 y notes on 13th commit
561 $commit_sha12 12th
562 y notes on 12th commit
564 $commit_sha11 11th
565 z notes on 11th commit
567 $commit_sha10 10th
568 x notes on 10th commit
570 $commit_sha9 9th
572 $commit_sha8 8th
573 z notes on 8th commit
575 $commit_sha7 7th
577 $commit_sha6 6th
579 $commit_sha5 5th
580 y notes on 5th commit
582 z notes on 5th commit
584 $commit_sha4 4th
585 y notes on 4th commit
587 $commit_sha3 3rd
588 y notes on 3rd commit
590 $commit_sha2 2nd
591 z notes on 2nd commit
593 $commit_sha1 1st
597 test_expect_success 'merge z into y with "union" strategy => Non-conflicting 3-way merge' '
598 git notes merge --strategy=union z &&
599 verify_notes y union
602 test_expect_success 'reset to pre-merge state (y)' '
603 git update-ref refs/notes/y refs/notes/y^1 &&
604 # Verify pre-merge state
605 verify_notes y y
608 test_expect_success 'merge z into y with "union" strategy overriding per-ref configuration => Non-conflicting 3-way merge' '
609 git -c notes.y.mergeStrategy="theirs" notes merge --strategy=union z &&
610 verify_notes y union
613 test_expect_success 'reset to pre-merge state (y)' '
614 git update-ref refs/notes/y refs/notes/y^1 &&
615 # Verify pre-merge state
616 verify_notes y y
619 test_expect_success 'merge z into y with "union" per-ref overriding general configuration => Non-conflicting 3-way merge' '
620 git -c notes.y.mergeStrategy="union" -c notes.mergeStrategy="theirs" notes merge z &&
621 verify_notes y union
624 test_expect_success 'reset to pre-merge state (y)' '
625 git update-ref refs/notes/y refs/notes/y^1 &&
626 # Verify pre-merge state
627 verify_notes y y
630 test_expect_success 'merge z into y with "manual" per-ref only checks specific ref configuration => Conflicting 3-way merge' '
631 test_must_fail git -c notes.z.mergeStrategy="union" notes merge z &&
632 git notes merge --abort &&
633 verify_notes y y
636 cat <<EOF | sort >expect_notes_union2
637 $(test_oid hash15e) $commit_sha15
638 $(test_oid hash14b) $commit_sha14
639 $(test_oid hash13b) $commit_sha13
640 $(test_oid hash12b) $commit_sha12
641 $(test_oid hash11c) $commit_sha11
642 $(test_oid hash10a) $commit_sha10
643 $(test_oid hash08c) $commit_sha8
644 $(test_oid hash05e) $commit_sha5
645 $(test_oid hash04b) $commit_sha4
646 $(test_oid hash03b) $commit_sha3
647 $(test_oid hash02c) $commit_sha2
650 cat >expect_log_union2 <<EOF
651 $commit_sha15 15th
652 z notes on 15th commit
654 y notes on 15th commit
656 $commit_sha14 14th
657 y notes on 14th commit
659 $commit_sha13 13th
660 y notes on 13th commit
662 $commit_sha12 12th
663 y notes on 12th commit
665 $commit_sha11 11th
666 z notes on 11th commit
668 $commit_sha10 10th
669 x notes on 10th commit
671 $commit_sha9 9th
673 $commit_sha8 8th
674 z notes on 8th commit
676 $commit_sha7 7th
678 $commit_sha6 6th
680 $commit_sha5 5th
681 z notes on 5th commit
683 y notes on 5th commit
685 $commit_sha4 4th
686 y notes on 4th commit
688 $commit_sha3 3rd
689 y notes on 3rd commit
691 $commit_sha2 2nd
692 z notes on 2nd commit
694 $commit_sha1 1st
698 test_expect_success 'merge y into z with "union" strategy => Non-conflicting 3-way merge' '
699 git config core.notesRef refs/notes/z &&
700 git notes merge --strategy=union y &&
701 verify_notes z union2
704 test_expect_success 'reset to pre-merge state (z)' '
705 git update-ref refs/notes/z refs/notes/z^1 &&
706 # Verify pre-merge state
707 verify_notes z z
710 cat <<EOF | sort >expect_notes_cat_sort_uniq
711 $(test_oid hash15f) $commit_sha15
712 $(test_oid hash14b) $commit_sha14
713 $(test_oid hash13b) $commit_sha13
714 $(test_oid hash12b) $commit_sha12
715 $(test_oid hash11c) $commit_sha11
716 $(test_oid hash10a) $commit_sha10
717 $(test_oid hash08c) $commit_sha8
718 $(test_oid hash05f) $commit_sha5
719 $(test_oid hash04b) $commit_sha4
720 $(test_oid hash03b) $commit_sha3
721 $(test_oid hash02c) $commit_sha2
724 cat >expect_log_cat_sort_uniq <<EOF
725 $commit_sha15 15th
726 y notes on 15th commit
727 z notes on 15th commit
729 $commit_sha14 14th
730 y notes on 14th commit
732 $commit_sha13 13th
733 y notes on 13th commit
735 $commit_sha12 12th
736 y notes on 12th commit
738 $commit_sha11 11th
739 z notes on 11th commit
741 $commit_sha10 10th
742 x notes on 10th commit
744 $commit_sha9 9th
746 $commit_sha8 8th
747 z notes on 8th commit
749 $commit_sha7 7th
751 $commit_sha6 6th
753 $commit_sha5 5th
754 y notes on 5th commit
755 z notes on 5th commit
757 $commit_sha4 4th
758 y notes on 4th commit
760 $commit_sha3 3rd
761 y notes on 3rd commit
763 $commit_sha2 2nd
764 z notes on 2nd commit
766 $commit_sha1 1st
770 test_expect_success 'merge y into z with "cat_sort_uniq" strategy => Non-conflicting 3-way merge' '
771 git notes merge --strategy=cat_sort_uniq y &&
772 verify_notes z cat_sort_uniq
775 test_expect_success 'reset to pre-merge state (z)' '
776 git update-ref refs/notes/z refs/notes/z^1 &&
777 # Verify pre-merge state
778 verify_notes z z
781 test_expect_success 'merge y into z with "cat_sort_uniq" strategy configuration option => Non-conflicting 3-way merge' '
782 git -c notes.mergeStrategy="cat_sort_uniq" notes merge y &&
783 verify_notes z cat_sort_uniq
786 test_done