1 #!/bin/sh
2 #
3 # Copyright (c) 2007 Johannes E. Schindelin
4 #
6 test_description='Test commit notes'
8 . ./test-lib.sh
10 cat > fake_editor.sh << \EOF
11 #!/bin/sh
12 echo "$MSG" > "$1"
13 echo "$MSG" >& 2
14 EOF
15 chmod a+x fake_editor.sh
16 GIT_EDITOR=./fake_editor.sh
17 export GIT_EDITOR
19 test_expect_success 'cannot annotate non-existing HEAD' '
20 (MSG=3 && export MSG && test_must_fail git notes add)
21 '
23 test_expect_success setup '
24 : > a1 &&
25 git add a1 &&
26 test_tick &&
27 git commit -m 1st &&
28 : > a2 &&
29 git add a2 &&
30 test_tick &&
31 git commit -m 2nd
32 '
34 test_expect_success 'need valid notes ref' '
35 (MSG=1 GIT_NOTES_REF=/ && export MSG GIT_NOTES_REF &&
36 test_must_fail git notes add) &&
37 (MSG=2 GIT_NOTES_REF=/ && export MSG GIT_NOTES_REF &&
38 test_must_fail git notes show)
39 '
41 test_expect_success 'refusing to add notes in refs/heads/' '
42 (MSG=1 GIT_NOTES_REF=refs/heads/bogus &&
43 export MSG GIT_NOTES_REF &&
44 test_must_fail git notes add)
45 '
47 test_expect_success 'refusing to edit notes in refs/remotes/' '
48 (MSG=1 GIT_NOTES_REF=refs/remotes/bogus &&
49 export MSG GIT_NOTES_REF &&
50 test_must_fail git notes edit)
51 '
53 # 1 indicates caught gracefully by die, 128 means git-show barked
54 test_expect_success 'handle empty notes gracefully' '
55 git notes show ; test 1 = $?
56 '
58 test_expect_success 'show non-existent notes entry with %N' '
59 for l in A B
60 do
61 echo "$l"
62 done >expect &&
63 git show -s --format='A%n%NB' >output &&
64 test_cmp expect output
65 '
67 test_expect_success 'create notes' '
68 git config core.notesRef refs/notes/commits &&
69 MSG=b4 git notes add &&
70 test ! -f .git/NOTES_EDITMSG &&
71 test 1 = $(git ls-tree refs/notes/commits | wc -l) &&
72 test b4 = $(git notes show) &&
73 git show HEAD^ &&
74 test_must_fail git notes show HEAD^
75 '
77 test_expect_success 'show notes entry with %N' '
78 for l in A b4 B
79 do
80 echo "$l"
81 done >expect &&
82 git show -s --format='A%n%NB' >output &&
83 test_cmp expect output
84 '
86 cat >expect <<EOF
87 d423f8c refs/notes/commits@{0}: notes: Notes added by 'git notes add'
88 EOF
90 test_expect_success 'create reflog entry' '
91 git reflog show refs/notes/commits >output &&
92 test_cmp expect output
93 '
95 test_expect_success 'edit existing notes' '
96 MSG=b3 git notes edit &&
97 test ! -f .git/NOTES_EDITMSG &&
98 test 1 = $(git ls-tree refs/notes/commits | wc -l) &&
99 test b3 = $(git notes show) &&
100 git show HEAD^ &&
101 test_must_fail git notes show HEAD^
102 '
104 test_expect_success 'cannot add note where one exists' '
105 ! MSG=b2 git notes add &&
106 test ! -f .git/NOTES_EDITMSG &&
107 test 1 = $(git ls-tree refs/notes/commits | wc -l) &&
108 test b3 = $(git notes show) &&
109 git show HEAD^ &&
110 test_must_fail git notes show HEAD^
111 '
113 test_expect_success 'can overwrite existing note with "git notes add -f"' '
114 MSG=b1 git notes add -f &&
115 test ! -f .git/NOTES_EDITMSG &&
116 test 1 = $(git ls-tree refs/notes/commits | wc -l) &&
117 test b1 = $(git notes show) &&
118 git show HEAD^ &&
119 test_must_fail git notes show HEAD^
120 '
122 cat > expect << EOF
123 commit 268048bfb8a1fb38e703baceb8ab235421bf80c5
124 Author: A U Thor <author@example.com>
125 Date: Thu Apr 7 15:14:13 2005 -0700
127 2nd
129 Notes:
130 b1
131 EOF
133 test_expect_success 'show notes' '
134 ! (git cat-file commit HEAD | grep b1) &&
135 git log -1 > output &&
136 test_cmp expect output
137 '
139 test_expect_success 'create multi-line notes (setup)' '
140 : > a3 &&
141 git add a3 &&
142 test_tick &&
143 git commit -m 3rd &&
144 MSG="b3
145 c3c3c3c3
146 d3d3d3" git notes add
147 '
149 cat > expect-multiline << EOF
150 commit 1584215f1d29c65e99c6c6848626553fdd07fd75
151 Author: A U Thor <author@example.com>
152 Date: Thu Apr 7 15:15:13 2005 -0700
154 3rd
156 Notes:
157 b3
158 c3c3c3c3
159 d3d3d3
160 EOF
162 printf "\n" >> expect-multiline
163 cat expect >> expect-multiline
165 test_expect_success 'show multi-line notes' '
166 git log -2 > output &&
167 test_cmp expect-multiline output
168 '
169 test_expect_success 'create -F notes (setup)' '
170 : > a4 &&
171 git add a4 &&
172 test_tick &&
173 git commit -m 4th &&
174 echo "xyzzy" > note5 &&
175 git notes add -F note5
176 '
178 cat > expect-F << EOF
179 commit 15023535574ded8b1a89052b32673f84cf9582b8
180 Author: A U Thor <author@example.com>
181 Date: Thu Apr 7 15:16:13 2005 -0700
183 4th
185 Notes:
186 xyzzy
187 EOF
189 printf "\n" >> expect-F
190 cat expect-multiline >> expect-F
192 test_expect_success 'show -F notes' '
193 git log -3 > output &&
194 test_cmp expect-F output
195 '
197 cat >expect << EOF
198 commit 15023535574ded8b1a89052b32673f84cf9582b8
199 tree e070e3af51011e47b183c33adf9736736a525709
200 parent 1584215f1d29c65e99c6c6848626553fdd07fd75
201 author A U Thor <author@example.com> 1112912173 -0700
202 committer C O Mitter <committer@example.com> 1112912173 -0700
204 4th
205 EOF
206 test_expect_success 'git log --pretty=raw does not show notes' '
207 git log -1 --pretty=raw >output &&
208 test_cmp expect output
209 '
211 cat >>expect <<EOF
213 Notes:
214 xyzzy
215 EOF
216 test_expect_success 'git log --show-notes' '
217 git log -1 --pretty=raw --show-notes >output &&
218 test_cmp expect output
219 '
221 test_expect_success 'git log --no-notes' '
222 git log -1 --no-notes >output &&
223 ! grep xyzzy output
224 '
226 test_expect_success 'git format-patch does not show notes' '
227 git format-patch -1 --stdout >output &&
228 ! grep xyzzy output
229 '
231 test_expect_success 'git format-patch --show-notes does show notes' '
232 git format-patch --show-notes -1 --stdout >output &&
233 grep xyzzy output
234 '
236 for pretty in \
237 "" --pretty --pretty=raw --pretty=short --pretty=medium \
238 --pretty=full --pretty=fuller --pretty=format:%s --oneline
239 do
240 case "$pretty" in
241 "") p= not= negate="" ;;
242 ?*) p="$pretty" not=" not" negate="!" ;;
243 esac
244 test_expect_success "git show $pretty does$not show notes" '
245 git show $p >output &&
246 eval "$negate grep xyzzy output"
247 '
248 done
250 test_expect_success 'create -m notes (setup)' '
251 : > a5 &&
252 git add a5 &&
253 test_tick &&
254 git commit -m 5th &&
255 git notes add -m spam -m "foo
256 bar
257 baz"
258 '
260 whitespace=" "
261 cat > expect-m << EOF
262 commit bd1753200303d0a0344be813e504253b3d98e74d
263 Author: A U Thor <author@example.com>
264 Date: Thu Apr 7 15:17:13 2005 -0700
266 5th
268 Notes:
269 spam
270 $whitespace
271 foo
272 bar
273 baz
274 EOF
276 printf "\n" >> expect-m
277 cat expect-F >> expect-m
279 test_expect_success 'show -m notes' '
280 git log -4 > output &&
281 test_cmp expect-m output
282 '
284 test_expect_success 'remove note with add -f -F /dev/null (setup)' '
285 git notes add -f -F /dev/null
286 '
288 cat > expect-rm-F << EOF
289 commit bd1753200303d0a0344be813e504253b3d98e74d
290 Author: A U Thor <author@example.com>
291 Date: Thu Apr 7 15:17:13 2005 -0700
293 5th
294 EOF
296 printf "\n" >> expect-rm-F
297 cat expect-F >> expect-rm-F
299 test_expect_success 'verify note removal with -F /dev/null' '
300 git log -4 > output &&
301 test_cmp expect-rm-F output &&
302 ! git notes show
303 '
305 test_expect_success 'do not create empty note with -m "" (setup)' '
306 git notes add -m ""
307 '
309 test_expect_success 'verify non-creation of note with -m ""' '
310 git log -4 > output &&
311 test_cmp expect-rm-F output &&
312 ! git notes show
313 '
315 cat > expect-combine_m_and_F << EOF
316 foo
318 xyzzy
320 bar
322 zyxxy
324 baz
325 EOF
327 test_expect_success 'create note with combination of -m and -F' '
328 echo "xyzzy" > note_a &&
329 echo "zyxxy" > note_b &&
330 git notes add -m "foo" -F note_a -m "bar" -F note_b -m "baz" &&
331 git notes show > output &&
332 test_cmp expect-combine_m_and_F output
333 '
335 test_expect_success 'remove note with "git notes remove" (setup)' '
336 git notes remove HEAD^ &&
337 git notes remove
338 '
340 cat > expect-rm-remove << EOF
341 commit bd1753200303d0a0344be813e504253b3d98e74d
342 Author: A U Thor <author@example.com>
343 Date: Thu Apr 7 15:17:13 2005 -0700
345 5th
347 commit 15023535574ded8b1a89052b32673f84cf9582b8
348 Author: A U Thor <author@example.com>
349 Date: Thu Apr 7 15:16:13 2005 -0700
351 4th
352 EOF
354 printf "\n" >> expect-rm-remove
355 cat expect-multiline >> expect-rm-remove
357 test_expect_success 'verify note removal with "git notes remove"' '
358 git log -4 > output &&
359 test_cmp expect-rm-remove output &&
360 ! git notes show HEAD^
361 '
363 cat > expect << EOF
364 c18dc024e14f08d18d14eea0d747ff692d66d6a3 1584215f1d29c65e99c6c6848626553fdd07fd75
365 c9c6af7f78bc47490dbf3e822cf2f3c24d4b9061 268048bfb8a1fb38e703baceb8ab235421bf80c5
366 EOF
368 test_expect_success 'list notes with "git notes list"' '
369 git notes list > output &&
370 test_cmp expect output
371 '
373 test_expect_success 'list notes with "git notes"' '
374 git notes > output &&
375 test_cmp expect output
376 '
378 cat > expect << EOF
379 c18dc024e14f08d18d14eea0d747ff692d66d6a3
380 EOF
382 test_expect_success 'list specific note with "git notes list <object>"' '
383 git notes list HEAD^^ > output &&
384 test_cmp expect output
385 '
387 cat > expect << EOF
388 EOF
390 test_expect_success 'listing non-existing notes fails' '
391 test_must_fail git notes list HEAD > output &&
392 test_cmp expect output
393 '
395 cat > expect << EOF
396 Initial set of notes
398 More notes appended with git notes append
399 EOF
401 test_expect_success 'append to existing note with "git notes append"' '
402 git notes add -m "Initial set of notes" &&
403 git notes append -m "More notes appended with git notes append" &&
404 git notes show > output &&
405 test_cmp expect output
406 '
408 cat > expect_list << EOF
409 c18dc024e14f08d18d14eea0d747ff692d66d6a3 1584215f1d29c65e99c6c6848626553fdd07fd75
410 c9c6af7f78bc47490dbf3e822cf2f3c24d4b9061 268048bfb8a1fb38e703baceb8ab235421bf80c5
411 4b6ad22357cc8a1296720574b8d2fbc22fab0671 bd1753200303d0a0344be813e504253b3d98e74d
412 EOF
414 test_expect_success '"git notes list" does not expand to "git notes list HEAD"' '
415 git notes list > output &&
416 test_cmp expect_list output
417 '
419 test_expect_success 'appending empty string does not change existing note' '
420 git notes append -m "" &&
421 git notes show > output &&
422 test_cmp expect output
423 '
425 test_expect_success 'git notes append == add when there is no existing note' '
426 git notes remove HEAD &&
427 test_must_fail git notes list HEAD &&
428 git notes append -m "Initial set of notes
430 More notes appended with git notes append" &&
431 git notes show > output &&
432 test_cmp expect output
433 '
435 test_expect_success 'appending empty string to non-existing note does not create note' '
436 git notes remove HEAD &&
437 test_must_fail git notes list HEAD &&
438 git notes append -m "" &&
439 test_must_fail git notes list HEAD
440 '
442 test_expect_success 'create other note on a different notes ref (setup)' '
443 : > a6 &&
444 git add a6 &&
445 test_tick &&
446 git commit -m 6th &&
447 GIT_NOTES_REF="refs/notes/other" git notes add -m "other note"
448 '
450 cat > expect-other << EOF
451 commit 387a89921c73d7ed72cd94d179c1c7048ca47756
452 Author: A U Thor <author@example.com>
453 Date: Thu Apr 7 15:18:13 2005 -0700
455 6th
457 Notes (other):
458 other note
459 EOF
461 cat > expect-not-other << EOF
462 commit 387a89921c73d7ed72cd94d179c1c7048ca47756
463 Author: A U Thor <author@example.com>
464 Date: Thu Apr 7 15:18:13 2005 -0700
466 6th
467 EOF
469 test_expect_success 'Do not show note on other ref by default' '
470 git log -1 > output &&
471 test_cmp expect-not-other output
472 '
474 test_expect_success 'Do show note when ref is given in GIT_NOTES_REF' '
475 GIT_NOTES_REF="refs/notes/other" git log -1 > output &&
476 test_cmp expect-other output
477 '
479 test_expect_success 'Do show note when ref is given in core.notesRef config' '
480 git config core.notesRef "refs/notes/other" &&
481 git log -1 > output &&
482 test_cmp expect-other output
483 '
485 test_expect_success 'Do not show note when core.notesRef is overridden' '
486 GIT_NOTES_REF="refs/notes/wrong" git log -1 > output &&
487 test_cmp expect-not-other output
488 '
490 cat > expect-both << EOF
491 commit 387a89921c73d7ed72cd94d179c1c7048ca47756
492 Author: A U Thor <author@example.com>
493 Date: Thu Apr 7 15:18:13 2005 -0700
495 6th
497 Notes:
498 order test
500 Notes (other):
501 other note
503 commit bd1753200303d0a0344be813e504253b3d98e74d
504 Author: A U Thor <author@example.com>
505 Date: Thu Apr 7 15:17:13 2005 -0700
507 5th
509 Notes:
510 replacement for deleted note
511 EOF
513 test_expect_success 'Show all notes when notes.displayRef=refs/notes/*' '
514 GIT_NOTES_REF=refs/notes/commits git notes add \
515 -m"replacement for deleted note" HEAD^ &&
516 GIT_NOTES_REF=refs/notes/commits git notes add -m"order test" &&
517 git config --unset core.notesRef &&
518 git config notes.displayRef "refs/notes/*" &&
519 git log -2 > output &&
520 test_cmp expect-both output
521 '
523 test_expect_success 'core.notesRef is implicitly in notes.displayRef' '
524 git config core.notesRef refs/notes/commits &&
525 git config notes.displayRef refs/notes/other &&
526 git log -2 > output &&
527 test_cmp expect-both output
528 '
530 test_expect_success 'notes.displayRef can be given more than once' '
531 git config --unset core.notesRef &&
532 git config notes.displayRef refs/notes/commits &&
533 git config --add notes.displayRef refs/notes/other &&
534 git log -2 > output &&
535 test_cmp expect-both output
536 '
538 cat > expect-both-reversed << EOF
539 commit 387a89921c73d7ed72cd94d179c1c7048ca47756
540 Author: A U Thor <author@example.com>
541 Date: Thu Apr 7 15:18:13 2005 -0700
543 6th
545 Notes (other):
546 other note
548 Notes:
549 order test
550 EOF
552 test_expect_success 'notes.displayRef respects order' '
553 git config core.notesRef refs/notes/other &&
554 git config --unset-all notes.displayRef &&
555 git config notes.displayRef refs/notes/commits &&
556 git log -1 > output &&
557 test_cmp expect-both-reversed output
558 '
560 test_expect_success 'GIT_NOTES_DISPLAY_REF works' '
561 git config --unset-all core.notesRef &&
562 git config --unset-all notes.displayRef &&
563 GIT_NOTES_DISPLAY_REF=refs/notes/commits:refs/notes/other \
564 git log -2 > output &&
565 test_cmp expect-both output
566 '
568 cat > expect-none << EOF
569 commit 387a89921c73d7ed72cd94d179c1c7048ca47756
570 Author: A U Thor <author@example.com>
571 Date: Thu Apr 7 15:18:13 2005 -0700
573 6th
575 commit bd1753200303d0a0344be813e504253b3d98e74d
576 Author: A U Thor <author@example.com>
577 Date: Thu Apr 7 15:17:13 2005 -0700
579 5th
580 EOF
582 test_expect_success 'GIT_NOTES_DISPLAY_REF overrides config' '
583 git config notes.displayRef "refs/notes/*" &&
584 GIT_NOTES_REF= GIT_NOTES_DISPLAY_REF= git log -2 > output &&
585 test_cmp expect-none output
586 '
588 test_expect_success '--show-notes=* adds to GIT_NOTES_DISPLAY_REF' '
589 GIT_NOTES_REF= GIT_NOTES_DISPLAY_REF= git log --show-notes=* -2 > output &&
590 test_cmp expect-both output
591 '
593 cat > expect-commits << EOF
594 commit 387a89921c73d7ed72cd94d179c1c7048ca47756
595 Author: A U Thor <author@example.com>
596 Date: Thu Apr 7 15:18:13 2005 -0700
598 6th
600 Notes:
601 order test
602 EOF
604 test_expect_success '--no-standard-notes' '
605 git log --no-standard-notes --show-notes=commits -1 > output &&
606 test_cmp expect-commits output
607 '
609 test_expect_success '--standard-notes' '
610 git log --no-standard-notes --show-notes=commits \
611 --standard-notes -2 > output &&
612 test_cmp expect-both output
613 '
615 test_expect_success '--show-notes=ref accumulates' '
616 git log --show-notes=other --show-notes=commits \
617 --no-standard-notes -1 > output &&
618 test_cmp expect-both-reversed output
619 '
621 test_expect_success 'Allow notes on non-commits (trees, blobs, tags)' '
622 git config core.notesRef refs/notes/other &&
623 echo "Note on a tree" > expect
624 git notes add -m "Note on a tree" HEAD: &&
625 git notes show HEAD: > actual &&
626 test_cmp expect actual &&
627 echo "Note on a blob" > expect
628 filename=$(git ls-tree --name-only HEAD | head -n1) &&
629 git notes add -m "Note on a blob" HEAD:$filename &&
630 git notes show HEAD:$filename > actual &&
631 test_cmp expect actual &&
632 echo "Note on a tag" > expect
633 git tag -a -m "This is an annotated tag" foobar HEAD^ &&
634 git notes add -m "Note on a tag" foobar &&
635 git notes show foobar > actual &&
636 test_cmp expect actual
637 '
639 cat > expect << EOF
640 commit 2ede89468182a62d0bde2583c736089bcf7d7e92
641 Author: A U Thor <author@example.com>
642 Date: Thu Apr 7 15:19:13 2005 -0700
644 7th
646 Notes (other):
647 other note
648 EOF
650 test_expect_success 'create note from other note with "git notes add -C"' '
651 : > a7 &&
652 git add a7 &&
653 test_tick &&
654 git commit -m 7th &&
655 git notes add -C $(git notes list HEAD^) &&
656 git log -1 > actual &&
657 test_cmp expect actual &&
658 test "$(git notes list HEAD)" = "$(git notes list HEAD^)"
659 '
661 test_expect_success 'create note from non-existing note with "git notes add -C" fails' '
662 : > a8 &&
663 git add a8 &&
664 test_tick &&
665 git commit -m 8th &&
666 test_must_fail git notes add -C deadbeef &&
667 test_must_fail git notes list HEAD
668 '
670 cat > expect << EOF
671 commit 016e982bad97eacdbda0fcbd7ce5b0ba87c81f1b
672 Author: A U Thor <author@example.com>
673 Date: Thu Apr 7 15:21:13 2005 -0700
675 9th
677 Notes (other):
678 yet another note
679 EOF
681 test_expect_success 'create note from other note with "git notes add -c"' '
682 : > a9 &&
683 git add a9 &&
684 test_tick &&
685 git commit -m 9th &&
686 MSG="yet another note" git notes add -c $(git notes list HEAD^^) &&
687 git log -1 > actual &&
688 test_cmp expect actual
689 '
691 test_expect_success 'create note from non-existing note with "git notes add -c" fails' '
692 : > a10 &&
693 git add a10 &&
694 test_tick &&
695 git commit -m 10th &&
696 (
697 MSG="yet another note" &&
698 export MSG &&
699 test_must_fail git notes add -c deadbeef
700 ) &&
701 test_must_fail git notes list HEAD
702 '
704 cat > expect << EOF
705 commit 016e982bad97eacdbda0fcbd7ce5b0ba87c81f1b
706 Author: A U Thor <author@example.com>
707 Date: Thu Apr 7 15:21:13 2005 -0700
709 9th
711 Notes (other):
712 yet another note
713 $whitespace
714 yet another note
715 EOF
717 test_expect_success 'append to note from other note with "git notes append -C"' '
718 git notes append -C $(git notes list HEAD^) HEAD^ &&
719 git log -1 HEAD^ > actual &&
720 test_cmp expect actual
721 '
723 cat > expect << EOF
724 commit ffed603236bfa3891c49644257a83598afe8ae5a
725 Author: A U Thor <author@example.com>
726 Date: Thu Apr 7 15:22:13 2005 -0700
728 10th
730 Notes (other):
731 other note
732 EOF
734 test_expect_success 'create note from other note with "git notes append -c"' '
735 MSG="other note" git notes append -c $(git notes list HEAD^) &&
736 git log -1 > actual &&
737 test_cmp expect actual
738 '
740 cat > expect << EOF
741 commit ffed603236bfa3891c49644257a83598afe8ae5a
742 Author: A U Thor <author@example.com>
743 Date: Thu Apr 7 15:22:13 2005 -0700
745 10th
747 Notes (other):
748 other note
749 $whitespace
750 yet another note
751 EOF
753 test_expect_success 'append to note from other note with "git notes append -c"' '
754 MSG="yet another note" git notes append -c $(git notes list HEAD) &&
755 git log -1 > actual &&
756 test_cmp expect actual
757 '
759 cat > expect << EOF
760 commit 6352c5e33dbcab725fe0579be16aa2ba8eb369be
761 Author: A U Thor <author@example.com>
762 Date: Thu Apr 7 15:23:13 2005 -0700
764 11th
766 Notes (other):
767 other note
768 $whitespace
769 yet another note
770 EOF
772 test_expect_success 'copy note with "git notes copy"' '
773 : > a11 &&
774 git add a11 &&
775 test_tick &&
776 git commit -m 11th &&
777 git notes copy HEAD^ HEAD &&
778 git log -1 > actual &&
779 test_cmp expect actual &&
780 test "$(git notes list HEAD)" = "$(git notes list HEAD^)"
781 '
783 test_expect_success 'prevent overwrite with "git notes copy"' '
784 test_must_fail git notes copy HEAD~2 HEAD &&
785 git log -1 > actual &&
786 test_cmp expect actual &&
787 test "$(git notes list HEAD)" = "$(git notes list HEAD^)"
788 '
790 cat > expect << EOF
791 commit 6352c5e33dbcab725fe0579be16aa2ba8eb369be
792 Author: A U Thor <author@example.com>
793 Date: Thu Apr 7 15:23:13 2005 -0700
795 11th
797 Notes (other):
798 yet another note
799 $whitespace
800 yet another note
801 EOF
803 test_expect_success 'allow overwrite with "git notes copy -f"' '
804 git notes copy -f HEAD~2 HEAD &&
805 git log -1 > actual &&
806 test_cmp expect actual &&
807 test "$(git notes list HEAD)" = "$(git notes list HEAD~2)"
808 '
810 test_expect_success 'cannot copy note from object without notes' '
811 : > a12 &&
812 git add a12 &&
813 test_tick &&
814 git commit -m 12th &&
815 : > a13 &&
816 git add a13 &&
817 test_tick &&
818 git commit -m 13th &&
819 test_must_fail git notes copy HEAD^ HEAD
820 '
822 cat > expect << EOF
823 commit e5d4fb5698d564ab8c73551538ecaf2b0c666185
824 Author: A U Thor <author@example.com>
825 Date: Thu Apr 7 15:25:13 2005 -0700
827 13th
829 Notes (other):
830 yet another note
831 $whitespace
832 yet another note
834 commit 7038787dfe22a14c3867ce816dbba39845359719
835 Author: A U Thor <author@example.com>
836 Date: Thu Apr 7 15:24:13 2005 -0700
838 12th
840 Notes (other):
841 other note
842 $whitespace
843 yet another note
844 EOF
846 test_expect_success 'git notes copy --stdin' '
847 (echo $(git rev-parse HEAD~3) $(git rev-parse HEAD^); \
848 echo $(git rev-parse HEAD~2) $(git rev-parse HEAD)) |
849 git notes copy --stdin &&
850 git log -2 > output &&
851 test_cmp expect output &&
852 test "$(git notes list HEAD)" = "$(git notes list HEAD~2)" &&
853 test "$(git notes list HEAD^)" = "$(git notes list HEAD~3)"
854 '
856 cat > expect << EOF
857 commit 37a0d4cba38afef96ba54a3ea567e6dac575700b
858 Author: A U Thor <author@example.com>
859 Date: Thu Apr 7 15:27:13 2005 -0700
861 15th
863 commit be28d8b4d9951ad940d229ee3b0b9ee3b1ec273d
864 Author: A U Thor <author@example.com>
865 Date: Thu Apr 7 15:26:13 2005 -0700
867 14th
868 EOF
870 test_expect_success 'git notes copy --for-rewrite (unconfigured)' '
871 test_commit 14th &&
872 test_commit 15th &&
873 (echo $(git rev-parse HEAD~3) $(git rev-parse HEAD^); \
874 echo $(git rev-parse HEAD~2) $(git rev-parse HEAD)) |
875 git notes copy --for-rewrite=foo &&
876 git log -2 > output &&
877 test_cmp expect output
878 '
880 cat > expect << EOF
881 commit 37a0d4cba38afef96ba54a3ea567e6dac575700b
882 Author: A U Thor <author@example.com>
883 Date: Thu Apr 7 15:27:13 2005 -0700
885 15th
887 Notes (other):
888 yet another note
889 $whitespace
890 yet another note
892 commit be28d8b4d9951ad940d229ee3b0b9ee3b1ec273d
893 Author: A U Thor <author@example.com>
894 Date: Thu Apr 7 15:26:13 2005 -0700
896 14th
898 Notes (other):
899 other note
900 $whitespace
901 yet another note
902 EOF
904 test_expect_success 'git notes copy --for-rewrite (enabled)' '
905 git config notes.rewriteMode overwrite &&
906 git config notes.rewriteRef "refs/notes/*" &&
907 (echo $(git rev-parse HEAD~3) $(git rev-parse HEAD^); \
908 echo $(git rev-parse HEAD~2) $(git rev-parse HEAD)) |
909 git notes copy --for-rewrite=foo &&
910 git log -2 > output &&
911 test_cmp expect output
912 '
914 test_expect_success 'git notes copy --for-rewrite (disabled)' '
915 git config notes.rewrite.bar false &&
916 echo $(git rev-parse HEAD~3) $(git rev-parse HEAD) |
917 git notes copy --for-rewrite=bar &&
918 git log -2 > output &&
919 test_cmp expect output
920 '
922 cat > expect << EOF
923 commit 37a0d4cba38afef96ba54a3ea567e6dac575700b
924 Author: A U Thor <author@example.com>
925 Date: Thu Apr 7 15:27:13 2005 -0700
927 15th
929 Notes (other):
930 a fresh note
931 EOF
933 test_expect_success 'git notes copy --for-rewrite (overwrite)' '
934 git notes add -f -m"a fresh note" HEAD^ &&
935 echo $(git rev-parse HEAD^) $(git rev-parse HEAD) |
936 git notes copy --for-rewrite=foo &&
937 git log -1 > output &&
938 test_cmp expect output
939 '
941 test_expect_success 'git notes copy --for-rewrite (ignore)' '
942 git config notes.rewriteMode ignore &&
943 echo $(git rev-parse HEAD^) $(git rev-parse HEAD) |
944 git notes copy --for-rewrite=foo &&
945 git log -1 > output &&
946 test_cmp expect output
947 '
949 cat > expect << EOF
950 commit 37a0d4cba38afef96ba54a3ea567e6dac575700b
951 Author: A U Thor <author@example.com>
952 Date: Thu Apr 7 15:27:13 2005 -0700
954 15th
956 Notes (other):
957 a fresh note
958 $whitespace
959 another fresh note
960 EOF
962 test_expect_success 'git notes copy --for-rewrite (append)' '
963 git notes add -f -m"another fresh note" HEAD^ &&
964 git config notes.rewriteMode concatenate &&
965 echo $(git rev-parse HEAD^) $(git rev-parse HEAD) |
966 git notes copy --for-rewrite=foo &&
967 git log -1 > output &&
968 test_cmp expect output
969 '
971 cat > expect << EOF
972 commit 37a0d4cba38afef96ba54a3ea567e6dac575700b
973 Author: A U Thor <author@example.com>
974 Date: Thu Apr 7 15:27:13 2005 -0700
976 15th
978 Notes (other):
979 a fresh note
980 $whitespace
981 another fresh note
982 $whitespace
983 append 1
984 $whitespace
985 append 2
986 EOF
988 test_expect_success 'git notes copy --for-rewrite (append two to one)' '
989 git notes add -f -m"append 1" HEAD^ &&
990 git notes add -f -m"append 2" HEAD^^ &&
991 (echo $(git rev-parse HEAD^) $(git rev-parse HEAD);
992 echo $(git rev-parse HEAD^^) $(git rev-parse HEAD)) |
993 git notes copy --for-rewrite=foo &&
994 git log -1 > output &&
995 test_cmp expect output
996 '
998 test_expect_success 'git notes copy --for-rewrite (append empty)' '
999 git notes remove HEAD^ &&
1000 echo $(git rev-parse HEAD^) $(git rev-parse HEAD) |
1001 git notes copy --for-rewrite=foo &&
1002 git log -1 > output &&
1003 test_cmp expect output
1004 '
1006 cat > expect << EOF
1007 commit 37a0d4cba38afef96ba54a3ea567e6dac575700b
1008 Author: A U Thor <author@example.com>
1009 Date: Thu Apr 7 15:27:13 2005 -0700
1011 15th
1013 Notes (other):
1014 replacement note 1
1015 EOF
1017 test_expect_success 'GIT_NOTES_REWRITE_MODE works' '
1018 git notes add -f -m"replacement note 1" HEAD^ &&
1019 echo $(git rev-parse HEAD^) $(git rev-parse HEAD) |
1020 GIT_NOTES_REWRITE_MODE=overwrite git notes copy --for-rewrite=foo &&
1021 git log -1 > output &&
1022 test_cmp expect output
1023 '
1025 cat > expect << EOF
1026 commit 37a0d4cba38afef96ba54a3ea567e6dac575700b
1027 Author: A U Thor <author@example.com>
1028 Date: Thu Apr 7 15:27:13 2005 -0700
1030 15th
1032 Notes (other):
1033 replacement note 2
1034 EOF
1036 test_expect_success 'GIT_NOTES_REWRITE_REF works' '
1037 git config notes.rewriteMode overwrite &&
1038 git notes add -f -m"replacement note 2" HEAD^ &&
1039 git config --unset-all notes.rewriteRef &&
1040 echo $(git rev-parse HEAD^) $(git rev-parse HEAD) |
1041 GIT_NOTES_REWRITE_REF=refs/notes/commits:refs/notes/other \
1042 git notes copy --for-rewrite=foo &&
1043 git log -1 > output &&
1044 test_cmp expect output
1045 '
1047 test_expect_success 'GIT_NOTES_REWRITE_REF overrides config' '
1048 git config notes.rewriteRef refs/notes/other &&
1049 git notes add -f -m"replacement note 3" HEAD^ &&
1050 echo $(git rev-parse HEAD^) $(git rev-parse HEAD) |
1051 GIT_NOTES_REWRITE_REF= git notes copy --for-rewrite=foo &&
1052 git log -1 > output &&
1053 test_cmp expect output
1054 '
1056 test_expect_success 'git notes copy diagnoses too many or too few parameters' '
1057 test_must_fail git notes copy &&
1058 test_must_fail git notes copy one two three
1059 '
1061 test_expect_success 'git notes get-ref (no overrides)' '
1062 git config --unset core.notesRef &&
1063 unset GIT_NOTES_REF &&
1064 test "$(git notes get-ref)" = "refs/notes/commits"
1065 '
1067 test_expect_success 'git notes get-ref (core.notesRef)' '
1068 git config core.notesRef refs/notes/foo &&
1069 test "$(git notes get-ref)" = "refs/notes/foo"
1070 '
1072 test_expect_success 'git notes get-ref (GIT_NOTES_REF)' '
1073 test "$(GIT_NOTES_REF=refs/notes/bar git notes get-ref)" = "refs/notes/bar"
1074 '
1076 test_expect_success 'git notes get-ref (--ref)' '
1077 test "$(GIT_NOTES_REF=refs/notes/bar git notes --ref=baz get-ref)" = "refs/notes/baz"
1078 '
1080 test_done