Change remote tracking to remote-tracking in non-trivial places
[git/gitweb.git] / t / t3301-notes.sh
bloba2b79a0430b2468241a578aaad479a09db774dd5
1 #!/bin/sh
3 # Copyright (c) 2007 Johannes E. Schindelin
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)
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
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)
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)
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)
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 = $?
58 test_expect_success 'show non-existent notes entry with %N' '
59 for l in A B
61 echo "$l"
62 done >expect &&
63 git show -s --format='A%n%NB' >output &&
64 test_cmp expect output
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^
77 test_expect_success 'show notes entry with %N' '
78 for l in A b4 B
80 echo "$l"
81 done >expect &&
82 git show -s --format='A%n%NB' >output &&
83 test_cmp expect output
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
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^
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^
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^
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
129 Notes:
133 test_expect_success 'show notes' '
134 ! (git cat-file commit HEAD | grep b1) &&
135 git log -1 > output &&
136 test_cmp expect output
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
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
156 Notes:
158 c3c3c3c3
159 d3d3d3
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
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
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
185 Notes:
186 xyzzy
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
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
206 test_expect_success 'git log --pretty=raw does not show notes' '
207 git log -1 --pretty=raw >output &&
208 test_cmp expect output
211 cat >>expect <<EOF
213 Notes:
214 xyzzy
216 test_expect_success 'git log --show-notes' '
217 git log -1 --pretty=raw --show-notes >output &&
218 test_cmp expect output
221 test_expect_success 'git log --no-notes' '
222 git log -1 --no-notes >output &&
223 ! grep xyzzy output
226 test_expect_success 'git format-patch does not show notes' '
227 git format-patch -1 --stdout >output &&
228 ! grep xyzzy output
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
236 for pretty in \
237 "" --pretty --pretty=raw --pretty=short --pretty=medium \
238 --pretty=full --pretty=fuller --pretty=format:%s --oneline
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"
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
257 baz"
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
268 Notes:
269 spam
270 $whitespace
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
284 test_expect_success 'remove note with add -f -F /dev/null (setup)' '
285 git notes add -f -F /dev/null
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
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 test_must_fail git notes show
305 test_expect_success 'do not create empty note with -m "" (setup)' '
306 git notes add -m ""
309 test_expect_success 'verify non-creation of note with -m ""' '
310 git log -4 > output &&
311 test_cmp expect-rm-F output &&
312 test_must_fail git notes show
315 cat > expect-combine_m_and_F << EOF
318 xyzzy
322 zyxxy
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
335 test_expect_success 'remove note with "git notes remove" (setup)' '
336 git notes remove HEAD^ &&
337 git notes remove
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
347 commit 15023535574ded8b1a89052b32673f84cf9582b8
348 Author: A U Thor <author@example.com>
349 Date: Thu Apr 7 15:16:13 2005 -0700
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 test_must_fail git notes show HEAD^
363 cat > expect << EOF
364 c18dc024e14f08d18d14eea0d747ff692d66d6a3 1584215f1d29c65e99c6c6848626553fdd07fd75
365 c9c6af7f78bc47490dbf3e822cf2f3c24d4b9061 268048bfb8a1fb38e703baceb8ab235421bf80c5
368 test_expect_success 'removing non-existing note should not create new commit' '
369 git rev-parse --verify refs/notes/commits > before_commit &&
370 test_must_fail git notes remove HEAD^ &&
371 git rev-parse --verify refs/notes/commits > after_commit &&
372 test_cmp before_commit after_commit
375 test_expect_success 'list notes with "git notes list"' '
376 git notes list > output &&
377 test_cmp expect output
380 test_expect_success 'list notes with "git notes"' '
381 git notes > output &&
382 test_cmp expect output
385 cat > expect << EOF
386 c18dc024e14f08d18d14eea0d747ff692d66d6a3
389 test_expect_success 'list specific note with "git notes list <object>"' '
390 git notes list HEAD^^ > output &&
391 test_cmp expect output
394 cat > expect << EOF
397 test_expect_success 'listing non-existing notes fails' '
398 test_must_fail git notes list HEAD > output &&
399 test_cmp expect output
402 cat > expect << EOF
403 Initial set of notes
405 More notes appended with git notes append
408 test_expect_success 'append to existing note with "git notes append"' '
409 git notes add -m "Initial set of notes" &&
410 git notes append -m "More notes appended with git notes append" &&
411 git notes show > output &&
412 test_cmp expect output
415 cat > expect_list << EOF
416 c18dc024e14f08d18d14eea0d747ff692d66d6a3 1584215f1d29c65e99c6c6848626553fdd07fd75
417 c9c6af7f78bc47490dbf3e822cf2f3c24d4b9061 268048bfb8a1fb38e703baceb8ab235421bf80c5
418 4b6ad22357cc8a1296720574b8d2fbc22fab0671 bd1753200303d0a0344be813e504253b3d98e74d
421 test_expect_success '"git notes list" does not expand to "git notes list HEAD"' '
422 git notes list > output &&
423 test_cmp expect_list output
426 test_expect_success 'appending empty string does not change existing note' '
427 git notes append -m "" &&
428 git notes show > output &&
429 test_cmp expect output
432 test_expect_success 'git notes append == add when there is no existing note' '
433 git notes remove HEAD &&
434 test_must_fail git notes list HEAD &&
435 git notes append -m "Initial set of notes
437 More notes appended with git notes append" &&
438 git notes show > output &&
439 test_cmp expect output
442 test_expect_success 'appending empty string to non-existing note does not create note' '
443 git notes remove HEAD &&
444 test_must_fail git notes list HEAD &&
445 git notes append -m "" &&
446 test_must_fail git notes list HEAD
449 test_expect_success 'create other note on a different notes ref (setup)' '
450 : > a6 &&
451 git add a6 &&
452 test_tick &&
453 git commit -m 6th &&
454 GIT_NOTES_REF="refs/notes/other" git notes add -m "other note"
457 cat > expect-other << EOF
458 commit 387a89921c73d7ed72cd94d179c1c7048ca47756
459 Author: A U Thor <author@example.com>
460 Date: Thu Apr 7 15:18:13 2005 -0700
464 Notes (other):
465 other note
468 cat > expect-not-other << EOF
469 commit 387a89921c73d7ed72cd94d179c1c7048ca47756
470 Author: A U Thor <author@example.com>
471 Date: Thu Apr 7 15:18:13 2005 -0700
476 test_expect_success 'Do not show note on other ref by default' '
477 git log -1 > output &&
478 test_cmp expect-not-other output
481 test_expect_success 'Do show note when ref is given in GIT_NOTES_REF' '
482 GIT_NOTES_REF="refs/notes/other" git log -1 > output &&
483 test_cmp expect-other output
486 test_expect_success 'Do show note when ref is given in core.notesRef config' '
487 git config core.notesRef "refs/notes/other" &&
488 git log -1 > output &&
489 test_cmp expect-other output
492 test_expect_success 'Do not show note when core.notesRef is overridden' '
493 GIT_NOTES_REF="refs/notes/wrong" git log -1 > output &&
494 test_cmp expect-not-other output
497 cat > expect-both << EOF
498 commit 387a89921c73d7ed72cd94d179c1c7048ca47756
499 Author: A U Thor <author@example.com>
500 Date: Thu Apr 7 15:18:13 2005 -0700
504 Notes:
505 order test
507 Notes (other):
508 other note
510 commit bd1753200303d0a0344be813e504253b3d98e74d
511 Author: A U Thor <author@example.com>
512 Date: Thu Apr 7 15:17:13 2005 -0700
516 Notes:
517 replacement for deleted note
520 test_expect_success 'Show all notes when notes.displayRef=refs/notes/*' '
521 GIT_NOTES_REF=refs/notes/commits git notes add \
522 -m"replacement for deleted note" HEAD^ &&
523 GIT_NOTES_REF=refs/notes/commits git notes add -m"order test" &&
524 git config --unset core.notesRef &&
525 git config notes.displayRef "refs/notes/*" &&
526 git log -2 > output &&
527 test_cmp expect-both output
530 test_expect_success 'core.notesRef is implicitly in notes.displayRef' '
531 git config core.notesRef refs/notes/commits &&
532 git config notes.displayRef refs/notes/other &&
533 git log -2 > output &&
534 test_cmp expect-both output
537 test_expect_success 'notes.displayRef can be given more than once' '
538 git config --unset core.notesRef &&
539 git config notes.displayRef refs/notes/commits &&
540 git config --add notes.displayRef refs/notes/other &&
541 git log -2 > output &&
542 test_cmp expect-both output
545 cat > expect-both-reversed << EOF
546 commit 387a89921c73d7ed72cd94d179c1c7048ca47756
547 Author: A U Thor <author@example.com>
548 Date: Thu Apr 7 15:18:13 2005 -0700
552 Notes (other):
553 other note
555 Notes:
556 order test
559 test_expect_success 'notes.displayRef respects order' '
560 git config core.notesRef refs/notes/other &&
561 git config --unset-all notes.displayRef &&
562 git config notes.displayRef refs/notes/commits &&
563 git log -1 > output &&
564 test_cmp expect-both-reversed output
567 test_expect_success 'GIT_NOTES_DISPLAY_REF works' '
568 git config --unset-all core.notesRef &&
569 git config --unset-all notes.displayRef &&
570 GIT_NOTES_DISPLAY_REF=refs/notes/commits:refs/notes/other \
571 git log -2 > output &&
572 test_cmp expect-both output
575 cat > expect-none << EOF
576 commit 387a89921c73d7ed72cd94d179c1c7048ca47756
577 Author: A U Thor <author@example.com>
578 Date: Thu Apr 7 15:18:13 2005 -0700
582 commit bd1753200303d0a0344be813e504253b3d98e74d
583 Author: A U Thor <author@example.com>
584 Date: Thu Apr 7 15:17:13 2005 -0700
589 test_expect_success 'GIT_NOTES_DISPLAY_REF overrides config' '
590 git config notes.displayRef "refs/notes/*" &&
591 GIT_NOTES_REF= GIT_NOTES_DISPLAY_REF= git log -2 > output &&
592 test_cmp expect-none output
595 test_expect_success '--show-notes=* adds to GIT_NOTES_DISPLAY_REF' '
596 GIT_NOTES_REF= GIT_NOTES_DISPLAY_REF= git log --show-notes=* -2 > output &&
597 test_cmp expect-both output
600 cat > expect-commits << EOF
601 commit 387a89921c73d7ed72cd94d179c1c7048ca47756
602 Author: A U Thor <author@example.com>
603 Date: Thu Apr 7 15:18:13 2005 -0700
607 Notes:
608 order test
611 test_expect_success '--no-standard-notes' '
612 git log --no-standard-notes --show-notes=commits -1 > output &&
613 test_cmp expect-commits output
616 test_expect_success '--standard-notes' '
617 git log --no-standard-notes --show-notes=commits \
618 --standard-notes -2 > output &&
619 test_cmp expect-both output
622 test_expect_success '--show-notes=ref accumulates' '
623 git log --show-notes=other --show-notes=commits \
624 --no-standard-notes -1 > output &&
625 test_cmp expect-both-reversed output
628 test_expect_success 'Allow notes on non-commits (trees, blobs, tags)' '
629 git config core.notesRef refs/notes/other &&
630 echo "Note on a tree" > expect
631 git notes add -m "Note on a tree" HEAD: &&
632 git notes show HEAD: > actual &&
633 test_cmp expect actual &&
634 echo "Note on a blob" > expect
635 filename=$(git ls-tree --name-only HEAD | head -n1) &&
636 git notes add -m "Note on a blob" HEAD:$filename &&
637 git notes show HEAD:$filename > actual &&
638 test_cmp expect actual &&
639 echo "Note on a tag" > expect
640 git tag -a -m "This is an annotated tag" foobar HEAD^ &&
641 git notes add -m "Note on a tag" foobar &&
642 git notes show foobar > actual &&
643 test_cmp expect actual
646 cat > expect << EOF
647 commit 2ede89468182a62d0bde2583c736089bcf7d7e92
648 Author: A U Thor <author@example.com>
649 Date: Thu Apr 7 15:19:13 2005 -0700
653 Notes (other):
654 other note
657 test_expect_success 'create note from other note with "git notes add -C"' '
658 : > a7 &&
659 git add a7 &&
660 test_tick &&
661 git commit -m 7th &&
662 git notes add -C $(git notes list HEAD^) &&
663 git log -1 > actual &&
664 test_cmp expect actual &&
665 test "$(git notes list HEAD)" = "$(git notes list HEAD^)"
668 test_expect_success 'create note from non-existing note with "git notes add -C" fails' '
669 : > a8 &&
670 git add a8 &&
671 test_tick &&
672 git commit -m 8th &&
673 test_must_fail git notes add -C deadbeef &&
674 test_must_fail git notes list HEAD
677 cat > expect << EOF
678 commit 016e982bad97eacdbda0fcbd7ce5b0ba87c81f1b
679 Author: A U Thor <author@example.com>
680 Date: Thu Apr 7 15:21:13 2005 -0700
684 Notes (other):
685 yet another note
688 test_expect_success 'create note from other note with "git notes add -c"' '
689 : > a9 &&
690 git add a9 &&
691 test_tick &&
692 git commit -m 9th &&
693 MSG="yet another note" git notes add -c $(git notes list HEAD^^) &&
694 git log -1 > actual &&
695 test_cmp expect actual
698 test_expect_success 'create note from non-existing note with "git notes add -c" fails' '
699 : > a10 &&
700 git add a10 &&
701 test_tick &&
702 git commit -m 10th &&
704 MSG="yet another note" &&
705 export MSG &&
706 test_must_fail git notes add -c deadbeef
707 ) &&
708 test_must_fail git notes list HEAD
711 cat > expect << EOF
712 commit 016e982bad97eacdbda0fcbd7ce5b0ba87c81f1b
713 Author: A U Thor <author@example.com>
714 Date: Thu Apr 7 15:21:13 2005 -0700
718 Notes (other):
719 yet another note
720 $whitespace
721 yet another note
724 test_expect_success 'append to note from other note with "git notes append -C"' '
725 git notes append -C $(git notes list HEAD^) HEAD^ &&
726 git log -1 HEAD^ > actual &&
727 test_cmp expect actual
730 cat > expect << EOF
731 commit ffed603236bfa3891c49644257a83598afe8ae5a
732 Author: A U Thor <author@example.com>
733 Date: Thu Apr 7 15:22:13 2005 -0700
735 10th
737 Notes (other):
738 other note
741 test_expect_success 'create note from other note with "git notes append -c"' '
742 MSG="other note" git notes append -c $(git notes list HEAD^) &&
743 git log -1 > actual &&
744 test_cmp expect actual
747 cat > expect << EOF
748 commit ffed603236bfa3891c49644257a83598afe8ae5a
749 Author: A U Thor <author@example.com>
750 Date: Thu Apr 7 15:22:13 2005 -0700
752 10th
754 Notes (other):
755 other note
756 $whitespace
757 yet another note
760 test_expect_success 'append to note from other note with "git notes append -c"' '
761 MSG="yet another note" git notes append -c $(git notes list HEAD) &&
762 git log -1 > actual &&
763 test_cmp expect actual
766 cat > expect << EOF
767 commit 6352c5e33dbcab725fe0579be16aa2ba8eb369be
768 Author: A U Thor <author@example.com>
769 Date: Thu Apr 7 15:23:13 2005 -0700
771 11th
773 Notes (other):
774 other note
775 $whitespace
776 yet another note
779 test_expect_success 'copy note with "git notes copy"' '
780 : > a11 &&
781 git add a11 &&
782 test_tick &&
783 git commit -m 11th &&
784 git notes copy HEAD^ HEAD &&
785 git log -1 > actual &&
786 test_cmp expect actual &&
787 test "$(git notes list HEAD)" = "$(git notes list HEAD^)"
790 test_expect_success 'prevent overwrite with "git notes copy"' '
791 test_must_fail git notes copy HEAD~2 HEAD &&
792 git log -1 > actual &&
793 test_cmp expect actual &&
794 test "$(git notes list HEAD)" = "$(git notes list HEAD^)"
797 cat > expect << EOF
798 commit 6352c5e33dbcab725fe0579be16aa2ba8eb369be
799 Author: A U Thor <author@example.com>
800 Date: Thu Apr 7 15:23:13 2005 -0700
802 11th
804 Notes (other):
805 yet another note
806 $whitespace
807 yet another note
810 test_expect_success 'allow overwrite with "git notes copy -f"' '
811 git notes copy -f HEAD~2 HEAD &&
812 git log -1 > actual &&
813 test_cmp expect actual &&
814 test "$(git notes list HEAD)" = "$(git notes list HEAD~2)"
817 test_expect_success 'cannot copy note from object without notes' '
818 : > a12 &&
819 git add a12 &&
820 test_tick &&
821 git commit -m 12th &&
822 : > a13 &&
823 git add a13 &&
824 test_tick &&
825 git commit -m 13th &&
826 test_must_fail git notes copy HEAD^ HEAD
829 cat > expect << EOF
830 commit e5d4fb5698d564ab8c73551538ecaf2b0c666185
831 Author: A U Thor <author@example.com>
832 Date: Thu Apr 7 15:25:13 2005 -0700
834 13th
836 Notes (other):
837 yet another note
838 $whitespace
839 yet another note
841 commit 7038787dfe22a14c3867ce816dbba39845359719
842 Author: A U Thor <author@example.com>
843 Date: Thu Apr 7 15:24:13 2005 -0700
845 12th
847 Notes (other):
848 other note
849 $whitespace
850 yet another note
853 test_expect_success 'git notes copy --stdin' '
854 (echo $(git rev-parse HEAD~3) $(git rev-parse HEAD^); \
855 echo $(git rev-parse HEAD~2) $(git rev-parse HEAD)) |
856 git notes copy --stdin &&
857 git log -2 > output &&
858 test_cmp expect output &&
859 test "$(git notes list HEAD)" = "$(git notes list HEAD~2)" &&
860 test "$(git notes list HEAD^)" = "$(git notes list HEAD~3)"
863 cat > expect << EOF
864 commit 37a0d4cba38afef96ba54a3ea567e6dac575700b
865 Author: A U Thor <author@example.com>
866 Date: Thu Apr 7 15:27:13 2005 -0700
868 15th
870 commit be28d8b4d9951ad940d229ee3b0b9ee3b1ec273d
871 Author: A U Thor <author@example.com>
872 Date: Thu Apr 7 15:26:13 2005 -0700
874 14th
877 test_expect_success 'git notes copy --for-rewrite (unconfigured)' '
878 test_commit 14th &&
879 test_commit 15th &&
880 (echo $(git rev-parse HEAD~3) $(git rev-parse HEAD^); \
881 echo $(git rev-parse HEAD~2) $(git rev-parse HEAD)) |
882 git notes copy --for-rewrite=foo &&
883 git log -2 > output &&
884 test_cmp expect output
887 cat > expect << EOF
888 commit 37a0d4cba38afef96ba54a3ea567e6dac575700b
889 Author: A U Thor <author@example.com>
890 Date: Thu Apr 7 15:27:13 2005 -0700
892 15th
894 Notes (other):
895 yet another note
896 $whitespace
897 yet another note
899 commit be28d8b4d9951ad940d229ee3b0b9ee3b1ec273d
900 Author: A U Thor <author@example.com>
901 Date: Thu Apr 7 15:26:13 2005 -0700
903 14th
905 Notes (other):
906 other note
907 $whitespace
908 yet another note
911 test_expect_success 'git notes copy --for-rewrite (enabled)' '
912 git config notes.rewriteMode overwrite &&
913 git config notes.rewriteRef "refs/notes/*" &&
914 (echo $(git rev-parse HEAD~3) $(git rev-parse HEAD^); \
915 echo $(git rev-parse HEAD~2) $(git rev-parse HEAD)) |
916 git notes copy --for-rewrite=foo &&
917 git log -2 > output &&
918 test_cmp expect output
921 test_expect_success 'git notes copy --for-rewrite (disabled)' '
922 git config notes.rewrite.bar false &&
923 echo $(git rev-parse HEAD~3) $(git rev-parse HEAD) |
924 git notes copy --for-rewrite=bar &&
925 git log -2 > output &&
926 test_cmp expect output
929 cat > expect << EOF
930 commit 37a0d4cba38afef96ba54a3ea567e6dac575700b
931 Author: A U Thor <author@example.com>
932 Date: Thu Apr 7 15:27:13 2005 -0700
934 15th
936 Notes (other):
937 a fresh note
940 test_expect_success 'git notes copy --for-rewrite (overwrite)' '
941 git notes add -f -m"a fresh note" HEAD^ &&
942 echo $(git rev-parse HEAD^) $(git rev-parse HEAD) |
943 git notes copy --for-rewrite=foo &&
944 git log -1 > output &&
945 test_cmp expect output
948 test_expect_success 'git notes copy --for-rewrite (ignore)' '
949 git config notes.rewriteMode ignore &&
950 echo $(git rev-parse HEAD^) $(git rev-parse HEAD) |
951 git notes copy --for-rewrite=foo &&
952 git log -1 > output &&
953 test_cmp expect output
956 cat > expect << EOF
957 commit 37a0d4cba38afef96ba54a3ea567e6dac575700b
958 Author: A U Thor <author@example.com>
959 Date: Thu Apr 7 15:27:13 2005 -0700
961 15th
963 Notes (other):
964 a fresh note
965 another fresh note
968 test_expect_success 'git notes copy --for-rewrite (append)' '
969 git notes add -f -m"another fresh note" HEAD^ &&
970 git config notes.rewriteMode concatenate &&
971 echo $(git rev-parse HEAD^) $(git rev-parse HEAD) |
972 git notes copy --for-rewrite=foo &&
973 git log -1 > output &&
974 test_cmp expect output
977 cat > expect << EOF
978 commit 37a0d4cba38afef96ba54a3ea567e6dac575700b
979 Author: A U Thor <author@example.com>
980 Date: Thu Apr 7 15:27:13 2005 -0700
982 15th
984 Notes (other):
985 a fresh note
986 another fresh note
987 append 1
988 append 2
991 test_expect_success 'git notes copy --for-rewrite (append two to one)' '
992 git notes add -f -m"append 1" HEAD^ &&
993 git notes add -f -m"append 2" HEAD^^ &&
994 (echo $(git rev-parse HEAD^) $(git rev-parse HEAD);
995 echo $(git rev-parse HEAD^^) $(git rev-parse HEAD)) |
996 git notes copy --for-rewrite=foo &&
997 git log -1 > output &&
998 test_cmp expect output
1001 test_expect_success 'git notes copy --for-rewrite (append empty)' '
1002 git notes remove HEAD^ &&
1003 echo $(git rev-parse HEAD^) $(git rev-parse HEAD) |
1004 git notes copy --for-rewrite=foo &&
1005 git log -1 > output &&
1006 test_cmp expect output
1009 cat > expect << EOF
1010 commit 37a0d4cba38afef96ba54a3ea567e6dac575700b
1011 Author: A U Thor <author@example.com>
1012 Date: Thu Apr 7 15:27:13 2005 -0700
1014 15th
1016 Notes (other):
1017 replacement note 1
1020 test_expect_success 'GIT_NOTES_REWRITE_MODE works' '
1021 git notes add -f -m"replacement note 1" HEAD^ &&
1022 echo $(git rev-parse HEAD^) $(git rev-parse HEAD) |
1023 GIT_NOTES_REWRITE_MODE=overwrite git notes copy --for-rewrite=foo &&
1024 git log -1 > output &&
1025 test_cmp expect output
1028 cat > expect << EOF
1029 commit 37a0d4cba38afef96ba54a3ea567e6dac575700b
1030 Author: A U Thor <author@example.com>
1031 Date: Thu Apr 7 15:27:13 2005 -0700
1033 15th
1035 Notes (other):
1036 replacement note 2
1039 test_expect_success 'GIT_NOTES_REWRITE_REF works' '
1040 git config notes.rewriteMode overwrite &&
1041 git notes add -f -m"replacement note 2" HEAD^ &&
1042 git config --unset-all notes.rewriteRef &&
1043 echo $(git rev-parse HEAD^) $(git rev-parse HEAD) |
1044 GIT_NOTES_REWRITE_REF=refs/notes/commits:refs/notes/other \
1045 git notes copy --for-rewrite=foo &&
1046 git log -1 > output &&
1047 test_cmp expect output
1050 test_expect_success 'GIT_NOTES_REWRITE_REF overrides config' '
1051 git config notes.rewriteRef refs/notes/other &&
1052 git notes add -f -m"replacement note 3" HEAD^ &&
1053 echo $(git rev-parse HEAD^) $(git rev-parse HEAD) |
1054 GIT_NOTES_REWRITE_REF= git notes copy --for-rewrite=foo &&
1055 git log -1 > output &&
1056 test_cmp expect output
1059 test_expect_success 'git notes copy diagnoses too many or too few parameters' '
1060 test_must_fail git notes copy &&
1061 test_must_fail git notes copy one two three
1064 test_done