]> git.ipfire.org Git - thirdparty/git.git/blame - t/t3301-notes.sh
Merge branch 'bc/sha-256-part-2'
[thirdparty/git.git] / t / t3301-notes.sh
CommitLineData
65d9fb48
JS
1#!/bin/sh
2#
3# Copyright (c) 2007 Johannes E. Schindelin
4#
5
6test_description='Test commit notes'
7
8. ./test-lib.sh
9
908a3203
JH
10write_script fake_editor <<\EOF
11echo "$MSG" >"$1"
12echo "$MSG" >&2
65d9fb48 13EOF
908a3203 14GIT_EDITOR=./fake_editor
cd067d3b 15export GIT_EDITOR
65d9fb48 16
908a3203
JH
17indent=" "
18
65d9fb48 19test_expect_success 'cannot annotate non-existing HEAD' '
512477b1 20 test_must_fail env MSG=3 git notes add
65d9fb48
JS
21'
22
908a3203
JH
23test_expect_success 'setup' '
24 test_commit 1st &&
25 test_commit 2nd
65d9fb48
JS
26'
27
28test_expect_success 'need valid notes ref' '
512477b1
DT
29 test_must_fail env MSG=1 GIT_NOTES_REF=/ git notes show &&
30 test_must_fail env MSG=2 GIT_NOTES_REF=/ git notes show
65d9fb48
JS
31'
32
7aa4754e 33test_expect_success 'refusing to add notes in refs/heads/' '
512477b1 34 test_must_fail env MSG=1 GIT_NOTES_REF=refs/heads/bogus git notes add
65d9fb48
JS
35'
36
7aa4754e 37test_expect_success 'refusing to edit notes in refs/remotes/' '
512477b1 38 test_must_fail env MSG=1 GIT_NOTES_REF=refs/heads/bogus git notes edit
65d9fb48
JS
39'
40
41# 1 indicates caught gracefully by die, 128 means git-show barked
42test_expect_success 'handle empty notes gracefully' '
0155a64e 43 test_expect_code 1 git notes show
65d9fb48
JS
44'
45
636db2c0 46test_expect_success 'show non-existent notes entry with %N' '
908a3203
JH
47 test_write_lines A B >expect &&
48 git show -s --format="A%n%NB" >actual &&
49 test_cmp expect actual
636db2c0
JH
50'
51
65d9fb48 52test_expect_success 'create notes' '
7aa4754e 53 MSG=b4 git notes add &&
908a3203
JH
54 test_path_is_missing .git/NOTES_EDITMSG &&
55 git ls-tree -r refs/notes/commits >actual &&
56 test_line_count = 1 actual &&
29a40b5a
DL
57 echo b4 >expect &&
58 git notes show >actual &&
59 test_cmp expect actual &&
cd067d3b
JH
60 git show HEAD^ &&
61 test_must_fail git notes show HEAD^
62'
63
636db2c0 64test_expect_success 'show notes entry with %N' '
908a3203
JH
65 test_write_lines A b4 B >expect &&
66 git show -s --format="A%n%NB" >actual &&
67 test_cmp expect actual
636db2c0
JH
68'
69
b2e256b0 70test_expect_success 'create reflog entry' '
b408cf8c 71 ref=$(git rev-parse --short refs/notes/commits) &&
908a3203 72 cat <<-EOF >expect &&
b408cf8c 73 $ref refs/notes/commits@{0}: notes: Notes added by '\''git notes add'\''
908a3203
JH
74 EOF
75 git reflog show refs/notes/commits >actual &&
76 test_cmp expect actual
4d80fa8f
MG
77'
78
cd067d3b 79test_expect_success 'edit existing notes' '
7aa4754e 80 MSG=b3 git notes edit &&
908a3203
JH
81 test_path_is_missing .git/NOTES_EDITMSG &&
82 git ls-tree -r refs/notes/commits >actual &&
83 test_line_count = 1 actual &&
29a40b5a
DL
84 echo b3 >expect &&
85 git notes show >actual &&
86 test_cmp expect actual &&
7aa4754e
JH
87 git show HEAD^ &&
88 test_must_fail git notes show HEAD^
89'
90
ee76f92f 91test_expect_success 'show notes from treeish' '
29a40b5a
DL
92 echo b3 >expect &&
93 git notes --ref commits^{tree} show >actual &&
94 test_cmp expect actual &&
95
96 echo b4 >expect &&
97 git notes --ref commits@{1} show >actual &&
98 test_cmp expect actual
ee76f92f
MH
99'
100
101test_expect_success 'cannot edit notes from non-ref' '
102 test_must_fail git notes --ref commits^{tree} edit &&
103 test_must_fail git notes --ref commits@{1} edit
104'
105
84a7e35e
JH
106test_expect_success 'cannot "git notes add -m" where notes already exists' '
107 test_must_fail git notes add -m "b2" &&
908a3203
JH
108 test_path_is_missing .git/NOTES_EDITMSG &&
109 git ls-tree -r refs/notes/commits >actual &&
110 test_line_count = 1 actual &&
29a40b5a
DL
111 echo b3 >expect &&
112 git notes show >actual &&
113 test_cmp expect actual &&
7aa4754e
JH
114 git show HEAD^ &&
115 test_must_fail git notes show HEAD^
116'
117
84a7e35e
JH
118test_expect_success 'can overwrite existing note with "git notes add -f -m"' '
119 git notes add -f -m "b1" &&
908a3203
JH
120 test_path_is_missing .git/NOTES_EDITMSG &&
121 git ls-tree -r refs/notes/commits >actual &&
122 test_line_count = 1 actual &&
29a40b5a
DL
123 echo b1 >expect &&
124 git notes show >actual &&
125 test_cmp expect actual &&
84a7e35e
JH
126 git show HEAD^ &&
127 test_must_fail git notes show HEAD^
128'
129
130test_expect_success 'add w/no options on existing note morphs into edit' '
131 MSG=b2 git notes add &&
908a3203
JH
132 test_path_is_missing .git/NOTES_EDITMSG &&
133 git ls-tree -r refs/notes/commits >actual &&
134 test_line_count = 1 actual &&
29a40b5a
DL
135 echo b2 >expect &&
136 git notes show >actual &&
137 test_cmp expect actual &&
84a7e35e
JH
138 git show HEAD^ &&
139 test_must_fail git notes show HEAD^
140'
141
7aa4754e
JH
142test_expect_success 'can overwrite existing note with "git notes add -f"' '
143 MSG=b1 git notes add -f &&
908a3203
JH
144 test_path_is_missing .git/NOTES_EDITMSG &&
145 git ls-tree -r refs/notes/commits >actual &&
146 test_line_count = 1 actual &&
29a40b5a
DL
147 echo b1 >expect &&
148 git notes show >actual &&
149 test_cmp expect actual &&
65d9fb48
JS
150 git show HEAD^ &&
151 test_must_fail git notes show HEAD^
152'
153
908a3203 154test_expect_success 'show notes' '
b408cf8c 155 commit=$(git rev-parse HEAD) &&
908a3203 156 cat >expect <<-EOF &&
b408cf8c 157 commit $commit
908a3203
JH
158 Author: A U Thor <author@example.com>
159 Date: Thu Apr 7 15:14:13 2005 -0700
65d9fb48 160
908a3203 161 ${indent}2nd
65d9fb48 162
908a3203
JH
163 Notes:
164 ${indent}b1
165 EOF
29a40b5a
DL
166 git cat-file commit HEAD >commits &&
167 ! grep b1 commits &&
908a3203
JH
168 git log -1 >actual &&
169 test_cmp expect actual
65d9fb48
JS
170'
171
908a3203
JH
172test_expect_success 'show multi-line notes' '
173 test_commit 3rd &&
174 MSG="b3${LF}c3c3c3c3${LF}d3d3d3" git notes add &&
b408cf8c 175 commit=$(git rev-parse HEAD) &&
908a3203 176 cat >expect-multiline <<-EOF &&
b408cf8c 177 commit $commit
908a3203
JH
178 Author: A U Thor <author@example.com>
179 Date: Thu Apr 7 15:15:13 2005 -0700
65d9fb48 180
908a3203 181 ${indent}3rd
65d9fb48 182
908a3203
JH
183 Notes:
184 ${indent}b3
185 ${indent}c3c3c3c3
186 ${indent}d3d3d3
65d9fb48 187
908a3203
JH
188 EOF
189 cat expect >>expect-multiline &&
190 git log -2 >actual &&
191 test_cmp expect-multiline actual
65d9fb48 192'
d9246d43 193
908a3203
JH
194test_expect_success 'show -F notes' '
195 test_commit 4th &&
196 echo "xyzzy" >note5 &&
197 git notes add -F note5 &&
b408cf8c 198 commit=$(git rev-parse HEAD) &&
908a3203 199 cat >expect-F <<-EOF &&
b408cf8c 200 commit $commit
908a3203
JH
201 Author: A U Thor <author@example.com>
202 Date: Thu Apr 7 15:16:13 2005 -0700
d9246d43 203
908a3203 204 ${indent}4th
d9246d43 205
908a3203
JH
206 Notes:
207 ${indent}xyzzy
d9246d43 208
908a3203
JH
209 EOF
210 cat expect-multiline >>expect-F &&
211 git log -3 >actual &&
212 test_cmp expect-F actual
d9246d43 213'
65d9fb48 214
84a7e35e 215test_expect_success 'Re-adding -F notes without -f fails' '
908a3203 216 echo "zyxxy" >note5 &&
84a7e35e 217 test_must_fail git notes add -F note5 &&
908a3203
JH
218 git log -3 >actual &&
219 test_cmp expect-F actual
84a7e35e
JH
220'
221
66b2ed09 222test_expect_success 'git log --pretty=raw does not show notes' '
b408cf8c 223 commit=$(git rev-parse HEAD) &&
224 tree=$(git rev-parse HEAD^{tree}) &&
225 parent=$(git rev-parse HEAD^) &&
908a3203 226 cat >expect <<-EOF &&
b408cf8c 227 commit $commit
228 tree $tree
229 parent $parent
908a3203
JH
230 author A U Thor <author@example.com> 1112912173 -0700
231 committer C O Mitter <committer@example.com> 1112912173 -0700
232
233 ${indent}4th
234 EOF
235 git log -1 --pretty=raw >actual &&
236 test_cmp expect actual
66b2ed09
JH
237'
238
66b2ed09 239test_expect_success 'git log --show-notes' '
908a3203
JH
240 cat >>expect <<-EOF &&
241
242 Notes:
243 ${indent}xyzzy
244 EOF
245 git log -1 --pretty=raw --show-notes >actual &&
246 test_cmp expect actual
66b2ed09
JH
247'
248
249test_expect_success 'git log --no-notes' '
908a3203
JH
250 git log -1 --no-notes >actual &&
251 ! grep xyzzy actual
66b2ed09
JH
252'
253
254test_expect_success 'git format-patch does not show notes' '
908a3203
JH
255 git format-patch -1 --stdout >actual &&
256 ! grep xyzzy actual
66b2ed09
JH
257'
258
259test_expect_success 'git format-patch --show-notes does show notes' '
908a3203
JH
260 git format-patch --show-notes -1 --stdout >actual &&
261 grep xyzzy actual
66b2ed09
JH
262'
263
7dccadf3
JH
264for pretty in \
265 "" --pretty --pretty=raw --pretty=short --pretty=medium \
266 --pretty=full --pretty=fuller --pretty=format:%s --oneline
66b2ed09
JH
267do
268 case "$pretty" in
269 "") p= not= negate="" ;;
7dccadf3 270 ?*) p="$pretty" not=" not" negate="!" ;;
66b2ed09
JH
271 esac
272 test_expect_success "git show $pretty does$not show notes" '
908a3203
JH
273 git show $p >actual &&
274 eval "$negate grep xyzzy actual"
66b2ed09
JH
275 '
276done
277
7249e912
JK
278test_expect_success 'setup alternate notes ref' '
279 git notes --ref=alternate add -m alternate
280'
281
282test_expect_success 'git log --notes shows default notes' '
908a3203
JH
283 git log -1 --notes >actual &&
284 grep xyzzy actual &&
285 ! grep alternate actual
7249e912
JK
286'
287
288test_expect_success 'git log --notes=X shows only X' '
908a3203
JH
289 git log -1 --notes=alternate >actual &&
290 ! grep xyzzy actual &&
291 grep alternate actual
7249e912
JK
292'
293
294test_expect_success 'git log --notes --notes=X shows both' '
908a3203
JH
295 git log -1 --notes --notes=alternate >actual &&
296 grep xyzzy actual &&
297 grep alternate actual
7249e912
JK
298'
299
92e0d425
JK
300test_expect_success 'git log --no-notes resets default state' '
301 git log -1 --notes --notes=alternate \
302 --no-notes --notes=alternate \
908a3203
JH
303 >actual &&
304 ! grep xyzzy actual &&
305 grep alternate actual
92e0d425
JK
306'
307
308test_expect_success 'git log --no-notes resets ref list' '
309 git log -1 --notes --notes=alternate \
310 --no-notes --notes \
908a3203
JH
311 >actual &&
312 grep xyzzy actual &&
313 ! grep alternate actual
cd067d3b
JH
314'
315
908a3203
JH
316test_expect_success 'show -m notes' '
317 test_commit 5th &&
318 git notes add -m spam -m "foo${LF}bar${LF}baz" &&
b408cf8c 319 commit=$(git rev-parse HEAD) &&
908a3203 320 cat >expect-m <<-EOF &&
b408cf8c 321 commit $commit
908a3203
JH
322 Author: A U Thor <author@example.com>
323 Date: Thu Apr 7 15:17:13 2005 -0700
324
325 ${indent}5th
326
327 Notes:
328 ${indent}spam
329 ${indent}
330 ${indent}foo
331 ${indent}bar
332 ${indent}baz
333
334 EOF
335 cat expect-F >>expect-m &&
336 git log -4 >actual &&
337 test_cmp expect-m actual
338'
339
340test_expect_success 'remove note with add -f -F /dev/null' '
341 git notes add -f -F /dev/null &&
b408cf8c 342 commit=$(git rev-parse HEAD) &&
908a3203 343 cat >expect-rm-F <<-EOF &&
b408cf8c 344 commit $commit
908a3203
JH
345 Author: A U Thor <author@example.com>
346 Date: Thu Apr 7 15:17:13 2005 -0700
347
348 ${indent}5th
349
350 EOF
351 cat expect-F >>expect-rm-F &&
352 git log -4 >actual &&
353 test_cmp expect-rm-F actual &&
ce14e0b2 354 test_must_fail git notes show
a0b4dfa9
JH
355'
356
908a3203
JH
357test_expect_success 'do not create empty note with -m ""' '
358 git notes add -m "" &&
359 git log -4 >actual &&
360 test_cmp expect-rm-F actual &&
ce14e0b2 361 test_must_fail git notes show
a0b4dfa9
JH
362'
363
908a3203
JH
364test_expect_success 'create note with combination of -m and -F' '
365 cat >expect-combine_m_and_F <<-EOF &&
366 foo
348f199b 367
908a3203 368 xyzzy
348f199b 369
908a3203 370 bar
348f199b 371
908a3203 372 zyxxy
348f199b 373
908a3203
JH
374 baz
375 EOF
376 echo "xyzzy" >note_a &&
377 echo "zyxxy" >note_b &&
348f199b 378 git notes add -m "foo" -F note_a -m "bar" -F note_b -m "baz" &&
908a3203
JH
379 git notes show >actual &&
380 test_cmp expect-combine_m_and_F actual
348f199b
JH
381'
382
908a3203 383test_expect_success 'remove note with "git notes remove"' '
348f199b 384 git notes remove HEAD^ &&
908a3203 385 git notes remove &&
b408cf8c 386 commit=$(git rev-parse HEAD) &&
387 parent=$(git rev-parse HEAD^) &&
908a3203 388 cat >expect-rm-remove <<-EOF &&
b408cf8c 389 commit $commit
908a3203
JH
390 Author: A U Thor <author@example.com>
391 Date: Thu Apr 7 15:17:13 2005 -0700
92b3385f 392
908a3203 393 ${indent}5th
92b3385f 394
b408cf8c 395 commit $parent
908a3203
JH
396 Author: A U Thor <author@example.com>
397 Date: Thu Apr 7 15:16:13 2005 -0700
92b3385f 398
908a3203 399 ${indent}4th
92b3385f 400
908a3203
JH
401 EOF
402 cat expect-multiline >>expect-rm-remove &&
403 git log -4 >actual &&
404 test_cmp expect-rm-remove actual &&
ce14e0b2 405 test_must_fail git notes show HEAD^
92b3385f
JH
406'
407
1ee1e43d 408test_expect_success 'removing non-existing note should not create new commit' '
908a3203 409 git rev-parse --verify refs/notes/commits >before_commit &&
1ee1e43d 410 test_must_fail git notes remove HEAD^ &&
908a3203 411 git rev-parse --verify refs/notes/commits >after_commit &&
1ee1e43d
JH
412 test_cmp before_commit after_commit
413'
414
c3ab1a8e
JH
415test_expect_success 'removing more than one' '
416 before=$(git rev-parse --verify refs/notes/commits) &&
417 test_when_finished "git update-ref refs/notes/commits $before" &&
418
419 # We have only two -- add another and make sure it stays
420 git notes add -m "extra" &&
421 git notes list HEAD >after-removal-expect &&
422 git notes remove HEAD^^ HEAD^^^ &&
423 git notes list | sed -e "s/ .*//" >actual &&
424 test_cmp after-removal-expect actual
425'
426
427test_expect_success 'removing is atomic' '
428 before=$(git rev-parse --verify refs/notes/commits) &&
429 test_when_finished "git update-ref refs/notes/commits $before" &&
430 test_must_fail git notes remove HEAD^^ HEAD^^^ HEAD^ &&
431 after=$(git rev-parse --verify refs/notes/commits) &&
432 test "$before" = "$after"
433'
434
2d370d2f
JH
435test_expect_success 'removing with --ignore-missing' '
436 before=$(git rev-parse --verify refs/notes/commits) &&
437 test_when_finished "git update-ref refs/notes/commits $before" &&
438
439 # We have only two -- add another and make sure it stays
440 git notes add -m "extra" &&
441 git notes list HEAD >after-removal-expect &&
442 git notes remove --ignore-missing HEAD^^ HEAD^^^ HEAD^ &&
443 git notes list | sed -e "s/ .*//" >actual &&
444 test_cmp after-removal-expect actual
445'
446
447test_expect_success 'removing with --ignore-missing but bogus ref' '
448 before=$(git rev-parse --verify refs/notes/commits) &&
449 test_when_finished "git update-ref refs/notes/commits $before" &&
450 test_must_fail git notes remove --ignore-missing HEAD^^ HEAD^^^ NO-SUCH-COMMIT &&
451 after=$(git rev-parse --verify refs/notes/commits) &&
452 test "$before" = "$after"
453'
454
46538012
JH
455test_expect_success 'remove reads from --stdin' '
456 before=$(git rev-parse --verify refs/notes/commits) &&
457 test_when_finished "git update-ref refs/notes/commits $before" &&
458
459 # We have only two -- add another and make sure it stays
460 git notes add -m "extra" &&
461 git notes list HEAD >after-removal-expect &&
462 git rev-parse HEAD^^ HEAD^^^ >input &&
463 git notes remove --stdin <input &&
464 git notes list | sed -e "s/ .*//" >actual &&
465 test_cmp after-removal-expect actual
466'
467
468test_expect_success 'remove --stdin is also atomic' '
469 before=$(git rev-parse --verify refs/notes/commits) &&
470 test_when_finished "git update-ref refs/notes/commits $before" &&
471 git rev-parse HEAD^^ HEAD^^^ HEAD^ >input &&
472 test_must_fail git notes remove --stdin <input &&
473 after=$(git rev-parse --verify refs/notes/commits) &&
474 test "$before" = "$after"
475'
476
477test_expect_success 'removing with --stdin --ignore-missing' '
478 before=$(git rev-parse --verify refs/notes/commits) &&
479 test_when_finished "git update-ref refs/notes/commits $before" &&
480
481 # We have only two -- add another and make sure it stays
482 git notes add -m "extra" &&
483 git notes list HEAD >after-removal-expect &&
484 git rev-parse HEAD^^ HEAD^^^ HEAD^ >input &&
485 git notes remove --ignore-missing --stdin <input &&
486 git notes list | sed -e "s/ .*//" >actual &&
487 test_cmp after-removal-expect actual
488'
489
e397421a 490test_expect_success 'list notes with "git notes list"' '
b408cf8c 491 commit_2=$(git rev-parse 2nd) &&
492 commit_3=$(git rev-parse 3rd) &&
29a40b5a
DL
493 note_2=$(git rev-parse refs/notes/commits:$commit_2) &&
494 note_3=$(git rev-parse refs/notes/commits:$commit_3) &&
b408cf8c 495 sort -t" " -k2 >expect <<-EOF &&
29a40b5a
DL
496 $note_2 $commit_2
497 $note_3 $commit_3
908a3203
JH
498 EOF
499 git notes list >actual &&
500 test_cmp expect actual
e397421a
JH
501'
502
503test_expect_success 'list notes with "git notes"' '
908a3203
JH
504 git notes >actual &&
505 test_cmp expect actual
e397421a
JH
506'
507
e397421a 508test_expect_success 'list specific note with "git notes list <object>"' '
29a40b5a 509 git rev-parse refs/notes/commits:$commit_3 >expect &&
908a3203
JH
510 git notes list HEAD^^ >actual &&
511 test_cmp expect actual
e397421a
JH
512'
513
e397421a 514test_expect_success 'listing non-existing notes fails' '
908a3203 515 test_must_fail git notes list HEAD >actual &&
1c5e94f4 516 test_must_be_empty actual
e397421a
JH
517'
518
2347fae5 519test_expect_success 'append to existing note with "git notes append"' '
908a3203
JH
520 cat >expect <<-EOF &&
521 Initial set of notes
522
523 More notes appended with git notes append
524 EOF
2347fae5
JH
525 git notes add -m "Initial set of notes" &&
526 git notes append -m "More notes appended with git notes append" &&
908a3203
JH
527 git notes show >actual &&
528 test_cmp expect actual
2347fae5
JH
529'
530
74884b52 531test_expect_success '"git notes list" does not expand to "git notes list HEAD"' '
b408cf8c 532 commit_5=$(git rev-parse 5th) &&
29a40b5a 533 note_5=$(git rev-parse refs/notes/commits:$commit_5) &&
b408cf8c 534 sort -t" " -k2 >expect_list <<-EOF &&
29a40b5a
DL
535 $note_2 $commit_2
536 $note_3 $commit_3
537 $note_5 $commit_5
908a3203
JH
538 EOF
539 git notes list >actual &&
540 test_cmp expect_list actual
74884b52
SB
541'
542
2347fae5
JH
543test_expect_success 'appending empty string does not change existing note' '
544 git notes append -m "" &&
908a3203
JH
545 git notes show >actual &&
546 test_cmp expect actual
2347fae5
JH
547'
548
549test_expect_success 'git notes append == add when there is no existing note' '
550 git notes remove HEAD &&
551 test_must_fail git notes list HEAD &&
908a3203
JH
552 git notes append -m "Initial set of notes${LF}${LF}More notes appended with git notes append" &&
553 git notes show >actual &&
554 test_cmp expect actual
2347fae5
JH
555'
556
557test_expect_success 'appending empty string to non-existing note does not create note' '
558 git notes remove HEAD &&
559 test_must_fail git notes list HEAD &&
560 git notes append -m "" &&
561 test_must_fail git notes list HEAD
562'
563
cd067d3b 564test_expect_success 'create other note on a different notes ref (setup)' '
908a3203
JH
565 test_commit 6th &&
566 GIT_NOTES_REF="refs/notes/other" git notes add -m "other note" &&
b408cf8c 567 commit=$(git rev-parse HEAD) &&
908a3203 568 cat >expect-not-other <<-EOF &&
b408cf8c 569 commit $commit
908a3203
JH
570 Author: A U Thor <author@example.com>
571 Date: Thu Apr 7 15:18:13 2005 -0700
cd067d3b 572
908a3203
JH
573 ${indent}6th
574 EOF
575 cp expect-not-other expect-other &&
576 cat >>expect-other <<-EOF
cd067d3b 577
908a3203
JH
578 Notes (other):
579 ${indent}other note
580 EOF
581'
3b78cdbe
JH
582
583test_expect_success 'Do not show note on other ref by default' '
908a3203
JH
584 git log -1 >actual &&
585 test_cmp expect-not-other actual
3b78cdbe
JH
586'
587
588test_expect_success 'Do show note when ref is given in GIT_NOTES_REF' '
908a3203
JH
589 GIT_NOTES_REF="refs/notes/other" git log -1 >actual &&
590 test_cmp expect-other actual
3b78cdbe
JH
591'
592
593test_expect_success 'Do show note when ref is given in core.notesRef config' '
908a3203
JH
594 test_config core.notesRef "refs/notes/other" &&
595 git log -1 >actual &&
596 test_cmp expect-other actual
3b78cdbe
JH
597'
598
599test_expect_success 'Do not show note when core.notesRef is overridden' '
908a3203
JH
600 test_config core.notesRef "refs/notes/other" &&
601 GIT_NOTES_REF="refs/notes/wrong" git log -1 >actual &&
602 test_cmp expect-not-other actual
3b78cdbe
JH
603'
604
908a3203 605test_expect_success 'Show all notes when notes.displayRef=refs/notes/*' '
b408cf8c 606 commit=$(git rev-parse HEAD) &&
607 parent=$(git rev-parse HEAD^) &&
908a3203 608 cat >expect-both <<-EOF &&
b408cf8c 609 commit $commit
908a3203
JH
610 Author: A U Thor <author@example.com>
611 Date: Thu Apr 7 15:18:13 2005 -0700
894a9d33 612
908a3203 613 ${indent}6th
894a9d33 614
908a3203
JH
615 Notes:
616 ${indent}order test
894a9d33 617
908a3203
JH
618 Notes (other):
619 ${indent}other note
894a9d33 620
b408cf8c 621 commit $parent
908a3203
JH
622 Author: A U Thor <author@example.com>
623 Date: Thu Apr 7 15:17:13 2005 -0700
894a9d33 624
908a3203 625 ${indent}5th
894a9d33 626
908a3203
JH
627 Notes:
628 ${indent}replacement for deleted note
629 EOF
894a9d33
TR
630 GIT_NOTES_REF=refs/notes/commits git notes add \
631 -m"replacement for deleted note" HEAD^ &&
632 GIT_NOTES_REF=refs/notes/commits git notes add -m"order test" &&
908a3203
JH
633 test_unconfig core.notesRef &&
634 test_config notes.displayRef "refs/notes/*" &&
635 git log -2 >actual &&
636 test_cmp expect-both actual
894a9d33
TR
637'
638
639test_expect_success 'core.notesRef is implicitly in notes.displayRef' '
908a3203
JH
640 test_config core.notesRef refs/notes/commits &&
641 test_config notes.displayRef refs/notes/other &&
642 git log -2 >actual &&
643 test_cmp expect-both actual
894a9d33
TR
644'
645
646test_expect_success 'notes.displayRef can be given more than once' '
908a3203
JH
647 test_unconfig core.notesRef &&
648 test_config notes.displayRef refs/notes/commits &&
894a9d33 649 git config --add notes.displayRef refs/notes/other &&
908a3203
JH
650 git log -2 >actual &&
651 test_cmp expect-both actual
894a9d33
TR
652'
653
908a3203 654test_expect_success 'notes.displayRef respects order' '
b408cf8c 655 commit=$(git rev-parse HEAD) &&
908a3203 656 cat >expect-both-reversed <<-EOF &&
b408cf8c 657 commit $commit
908a3203
JH
658 Author: A U Thor <author@example.com>
659 Date: Thu Apr 7 15:18:13 2005 -0700
894a9d33 660
908a3203 661 ${indent}6th
894a9d33 662
908a3203
JH
663 Notes (other):
664 ${indent}other note
894a9d33 665
908a3203
JH
666 Notes:
667 ${indent}order test
668 EOF
669 test_config core.notesRef refs/notes/other &&
670 test_config notes.displayRef refs/notes/commits &&
671 git log -1 >actual &&
672 test_cmp expect-both-reversed actual
894a9d33
TR
673'
674
675test_expect_success 'GIT_NOTES_DISPLAY_REF works' '
894a9d33 676 GIT_NOTES_DISPLAY_REF=refs/notes/commits:refs/notes/other \
908a3203
JH
677 git log -2 >actual &&
678 test_cmp expect-both actual
894a9d33
TR
679'
680
908a3203 681test_expect_success 'GIT_NOTES_DISPLAY_REF overrides config' '
b408cf8c 682 commit=$(git rev-parse HEAD) &&
683 parent=$(git rev-parse HEAD^) &&
908a3203 684 cat >expect-none <<-EOF &&
b408cf8c 685 commit $commit
908a3203
JH
686 Author: A U Thor <author@example.com>
687 Date: Thu Apr 7 15:18:13 2005 -0700
894a9d33 688
908a3203 689 ${indent}6th
894a9d33 690
b408cf8c 691 commit $parent
908a3203
JH
692 Author: A U Thor <author@example.com>
693 Date: Thu Apr 7 15:17:13 2005 -0700
894a9d33 694
908a3203
JH
695 ${indent}5th
696 EOF
697 test_config notes.displayRef "refs/notes/*" &&
698 GIT_NOTES_REF= GIT_NOTES_DISPLAY_REF= git log -2 >actual &&
699 test_cmp expect-none actual
894a9d33
TR
700'
701
702test_expect_success '--show-notes=* adds to GIT_NOTES_DISPLAY_REF' '
908a3203
JH
703 GIT_NOTES_REF= GIT_NOTES_DISPLAY_REF= git log --show-notes=* -2 >actual &&
704 test_cmp expect-both actual
894a9d33
TR
705'
706
908a3203 707test_expect_success '--no-standard-notes' '
b408cf8c 708 commit=$(git rev-parse HEAD) &&
85cb1d0b 709 cat >expect-commits <<-EOF &&
b408cf8c 710 commit $commit
908a3203
JH
711 Author: A U Thor <author@example.com>
712 Date: Thu Apr 7 15:18:13 2005 -0700
894a9d33 713
908a3203 714 ${indent}6th
894a9d33 715
908a3203
JH
716 Notes:
717 ${indent}order test
718 EOF
719 git log --no-standard-notes --show-notes=commits -1 >actual &&
720 test_cmp expect-commits actual
894a9d33
TR
721'
722
723test_expect_success '--standard-notes' '
908a3203 724 test_config notes.displayRef "refs/notes/*" &&
894a9d33 725 git log --no-standard-notes --show-notes=commits \
908a3203
JH
726 --standard-notes -2 >actual &&
727 test_cmp expect-both actual
894a9d33
TR
728'
729
730test_expect_success '--show-notes=ref accumulates' '
731 git log --show-notes=other --show-notes=commits \
908a3203
JH
732 --no-standard-notes -1 >actual &&
733 test_cmp expect-both-reversed actual
894a9d33
TR
734'
735
b24bb997 736test_expect_success 'Allow notes on non-commits (trees, blobs, tags)' '
908a3203
JH
737 test_config core.notesRef refs/notes/other &&
738 echo "Note on a tree" >expect &&
7aa4754e 739 git notes add -m "Note on a tree" HEAD: &&
908a3203 740 git notes show HEAD: >actual &&
b24bb997 741 test_cmp expect actual &&
908a3203 742 echo "Note on a blob" >expect &&
29a40b5a
DL
743 git ls-tree --name-only HEAD >files &&
744 filename=$(head -n1 files) &&
7aa4754e 745 git notes add -m "Note on a blob" HEAD:$filename &&
908a3203 746 git notes show HEAD:$filename >actual &&
b24bb997 747 test_cmp expect actual &&
908a3203 748 echo "Note on a tag" >expect &&
b24bb997 749 git tag -a -m "This is an annotated tag" foobar HEAD^ &&
7aa4754e 750 git notes add -m "Note on a tag" foobar &&
908a3203 751 git notes show foobar >actual &&
b24bb997
JH
752 test_cmp expect actual
753'
754
908a3203 755test_expect_success 'create note from other note with "git notes add -C"' '
b408cf8c 756 test_commit 7th &&
757 commit=$(git rev-parse HEAD) &&
908a3203 758 cat >expect <<-EOF &&
b408cf8c 759 commit $commit
908a3203
JH
760 Author: A U Thor <author@example.com>
761 Date: Thu Apr 7 15:19:13 2005 -0700
0691cff7 762
908a3203 763 ${indent}7th
0691cff7 764
908a3203
JH
765 Notes:
766 ${indent}order test
767 EOF
29a40b5a
DL
768 note=$(git notes list HEAD^) &&
769 git notes add -C $note &&
908a3203 770 git log -1 >actual &&
0691cff7 771 test_cmp expect actual &&
29a40b5a
DL
772 git notes list HEAD^ >expect &&
773 git notes list HEAD >actual &&
774 test_cmp expect actual
0691cff7
JH
775'
776
777test_expect_success 'create note from non-existing note with "git notes add -C" fails' '
908a3203 778 test_commit 8th &&
0691cff7
JH
779 test_must_fail git notes add -C deadbeef &&
780 test_must_fail git notes list HEAD
781'
782
ce8daa1e
JH
783test_expect_success 'create note from non-blob with "git notes add -C" fails' '
784 commit=$(git rev-parse --verify HEAD) &&
785 tree=$(git rev-parse --verify HEAD:) &&
786 test_must_fail git notes add -C $commit &&
787 test_must_fail git notes add -C $tree &&
788 test_must_fail git notes list HEAD
789'
790
908a3203 791test_expect_success 'create note from blob with "git notes add -C" reuses blob id' '
b408cf8c 792 commit=$(git rev-parse HEAD) &&
908a3203 793 cat >expect <<-EOF &&
b408cf8c 794 commit $commit
908a3203
JH
795 Author: A U Thor <author@example.com>
796 Date: Thu Apr 7 15:20:13 2005 -0700
ce8daa1e 797
908a3203 798 ${indent}8th
ce8daa1e 799
908a3203
JH
800 Notes:
801 ${indent}This is a blob object
802 EOF
29a40b5a
DL
803 echo "This is a blob object" | git hash-object -w --stdin >blob &&
804 git notes add -C $(cat blob) &&
908a3203 805 git log -1 >actual &&
ce8daa1e 806 test_cmp expect actual &&
29a40b5a
DL
807 git notes list HEAD >actual &&
808 test_cmp blob actual
ce8daa1e
JH
809'
810
908a3203 811test_expect_success 'create note from other note with "git notes add -c"' '
b408cf8c 812 test_commit 9th &&
813 commit=$(git rev-parse HEAD) &&
908a3203 814 cat >expect <<-EOF &&
b408cf8c 815 commit $commit
908a3203
JH
816 Author: A U Thor <author@example.com>
817 Date: Thu Apr 7 15:21:13 2005 -0700
0691cff7 818
908a3203 819 ${indent}9th
0691cff7 820
908a3203
JH
821 Notes:
822 ${indent}yet another note
823 EOF
29a40b5a
DL
824 note=$(git notes list HEAD^^) &&
825 MSG="yet another note" git notes add -c $note &&
908a3203 826 git log -1 >actual &&
0691cff7
JH
827 test_cmp expect actual
828'
829
830test_expect_success 'create note from non-existing note with "git notes add -c" fails' '
908a3203 831 test_commit 10th &&
512477b1 832 test_must_fail env MSG="yet another note" git notes add -c deadbeef &&
0691cff7
JH
833 test_must_fail git notes list HEAD
834'
835
0691cff7 836test_expect_success 'append to note from other note with "git notes append -C"' '
b408cf8c 837 commit=$(git rev-parse HEAD^) &&
908a3203 838 cat >expect <<-EOF &&
b408cf8c 839 commit $commit
908a3203
JH
840 Author: A U Thor <author@example.com>
841 Date: Thu Apr 7 15:21:13 2005 -0700
842
843 ${indent}9th
844
845 Notes:
846 ${indent}yet another note
847 ${indent}
848 ${indent}yet another note
849 EOF
29a40b5a
DL
850 note=$(git notes list HEAD^) &&
851 git notes append -C $note HEAD^ &&
908a3203 852 git log -1 HEAD^ >actual &&
0691cff7
JH
853 test_cmp expect actual
854'
855
908a3203 856test_expect_success 'create note from other note with "git notes append -c"' '
b408cf8c 857 commit=$(git rev-parse HEAD) &&
908a3203 858 cat >expect <<-EOF &&
b408cf8c 859 commit $commit
908a3203
JH
860 Author: A U Thor <author@example.com>
861 Date: Thu Apr 7 15:22:13 2005 -0700
0691cff7 862
908a3203 863 ${indent}10th
0691cff7 864
908a3203
JH
865 Notes:
866 ${indent}other note
867 EOF
29a40b5a
DL
868 note=$(git notes list HEAD^) &&
869 MSG="other note" git notes append -c $note &&
908a3203 870 git log -1 >actual &&
0691cff7
JH
871 test_cmp expect actual
872'
873
0691cff7 874test_expect_success 'append to note from other note with "git notes append -c"' '
b408cf8c 875 commit=$(git rev-parse HEAD) &&
908a3203 876 cat >expect <<-EOF &&
b408cf8c 877 commit $commit
908a3203
JH
878 Author: A U Thor <author@example.com>
879 Date: Thu Apr 7 15:22:13 2005 -0700
880
881 ${indent}10th
882
883 Notes:
884 ${indent}other note
885 ${indent}
886 ${indent}yet another note
887 EOF
29a40b5a
DL
888 note=$(git notes list HEAD) &&
889 MSG="yet another note" git notes append -c $note &&
908a3203 890 git log -1 >actual &&
0691cff7
JH
891 test_cmp expect actual
892'
893
e73bbd96 894test_expect_success 'copy note with "git notes copy"' '
d58deb9c
ĐTCD
895 commit=$(git rev-parse 4th) &&
896 cat >expect <<-EOF &&
897 commit $commit
898 Author: A U Thor <author@example.com>
899 Date: Thu Apr 7 15:16:13 2005 -0700
900
901 ${indent}4th
902
903 Notes:
904 ${indent}This is a blob object
905 EOF
906 git notes copy 8th 4th &&
907 git log 3rd..4th >actual &&
908 test_cmp expect actual &&
29a40b5a
DL
909 git notes list 4th >expect &&
910 git notes list 8th >actual &&
911 test_cmp expect actual
d58deb9c
ĐTCD
912'
913
914test_expect_success 'copy note with "git notes copy" with default' '
b408cf8c 915 test_commit 11th &&
916 commit=$(git rev-parse HEAD) &&
908a3203 917 cat >expect <<-EOF &&
b408cf8c 918 commit $commit
908a3203
JH
919 Author: A U Thor <author@example.com>
920 Date: Thu Apr 7 15:23:13 2005 -0700
921
922 ${indent}11th
923
924 Notes:
925 ${indent}other note
926 ${indent}
927 ${indent}yet another note
928 EOF
d58deb9c 929 git notes copy HEAD^ &&
908a3203 930 git log -1 >actual &&
e73bbd96 931 test_cmp expect actual &&
29a40b5a
DL
932 git notes list HEAD^ >expect &&
933 git notes list HEAD >actual &&
934 test_cmp expect actual
e73bbd96
JH
935'
936
937test_expect_success 'prevent overwrite with "git notes copy"' '
938 test_must_fail git notes copy HEAD~2 HEAD &&
29a40b5a
DL
939 cat >expect <<-EOF &&
940 commit $commit
941 Author: A U Thor <author@example.com>
942 Date: Thu Apr 7 15:23:13 2005 -0700
943
944 ${indent}11th
945
946 Notes:
947 ${indent}other note
948 ${indent}
949 ${indent}yet another note
950 EOF
908a3203 951 git log -1 >actual &&
e73bbd96 952 test_cmp expect actual &&
29a40b5a
DL
953 git notes list HEAD^ >expect &&
954 git notes list HEAD >actual &&
955 test_cmp expect actual
e73bbd96
JH
956'
957
e73bbd96 958test_expect_success 'allow overwrite with "git notes copy -f"' '
d58deb9c
ĐTCD
959 commit=$(git rev-parse HEAD) &&
960 cat >expect <<-EOF &&
961 commit $commit
962 Author: A U Thor <author@example.com>
963 Date: Thu Apr 7 15:23:13 2005 -0700
964
965 ${indent}11th
966
967 Notes:
968 ${indent}This is a blob object
969 EOF
970 git notes copy -f HEAD~3 HEAD &&
971 git log -1 >actual &&
972 test_cmp expect actual &&
29a40b5a
DL
973 git notes list HEAD~3 >expect &&
974 git notes list HEAD >actual &&
975 test_cmp expect actual
d58deb9c
ĐTCD
976'
977
978test_expect_success 'allow overwrite with "git notes copy -f" with default' '
b408cf8c 979 commit=$(git rev-parse HEAD) &&
908a3203 980 cat >expect <<-EOF &&
b408cf8c 981 commit $commit
908a3203
JH
982 Author: A U Thor <author@example.com>
983 Date: Thu Apr 7 15:23:13 2005 -0700
984
985 ${indent}11th
986
987 Notes:
988 ${indent}yet another note
989 ${indent}
990 ${indent}yet another note
991 EOF
d58deb9c 992 git notes copy -f HEAD~2 &&
908a3203 993 git log -1 >actual &&
e73bbd96 994 test_cmp expect actual &&
29a40b5a
DL
995 git notes list HEAD~2 >expect &&
996 git notes list HEAD >actual &&
997 test_cmp expect actual
e73bbd96
JH
998'
999
1000test_expect_success 'cannot copy note from object without notes' '
908a3203
JH
1001 test_commit 12th &&
1002 test_commit 13th &&
e73bbd96
JH
1003 test_must_fail git notes copy HEAD^ HEAD
1004'
1005
908a3203 1006test_expect_success 'git notes copy --stdin' '
b408cf8c 1007 commit=$(git rev-parse HEAD) &&
1008 parent=$(git rev-parse HEAD^) &&
908a3203 1009 cat >expect <<-EOF &&
b408cf8c 1010 commit $commit
908a3203
JH
1011 Author: A U Thor <author@example.com>
1012 Date: Thu Apr 7 15:25:13 2005 -0700
160baa0d 1013
908a3203 1014 ${indent}13th
160baa0d 1015
908a3203
JH
1016 Notes:
1017 ${indent}yet another note
1018 ${indent}
1019 ${indent}yet another note
160baa0d 1020
b408cf8c 1021 commit $parent
908a3203
JH
1022 Author: A U Thor <author@example.com>
1023 Date: Thu Apr 7 15:24:13 2005 -0700
160baa0d 1024
908a3203 1025 ${indent}12th
160baa0d 1026
908a3203
JH
1027 Notes:
1028 ${indent}other note
1029 ${indent}
1030 ${indent}yet another note
1031 EOF
29a40b5a
DL
1032 from=$(git rev-parse HEAD~3) &&
1033 to=$(git rev-parse HEAD^) &&
1034 echo "$from" "$to" >copy &&
1035 from=$(git rev-parse HEAD~2) &&
1036 to=$(git rev-parse HEAD) &&
1037 echo "$from" "$to" >>copy &&
1038 git notes copy --stdin <copy &&
908a3203
JH
1039 git log -2 >actual &&
1040 test_cmp expect actual &&
29a40b5a
DL
1041 git notes list HEAD~2 >expect &&
1042 git notes list HEAD >actual &&
1043 test_cmp expect actual &&
1044 git notes list HEAD~3 >expect &&
1045 git notes list HEAD^ >actual &&
1046 test_cmp expect actual
160baa0d
TR
1047'
1048
908a3203 1049test_expect_success 'git notes copy --for-rewrite (unconfigured)' '
b408cf8c 1050 test_commit 14th &&
1051 test_commit 15th &&
1052 commit=$(git rev-parse HEAD) &&
1053 parent=$(git rev-parse HEAD^) &&
908a3203 1054 cat >expect <<-EOF &&
b408cf8c 1055 commit $commit
908a3203
JH
1056 Author: A U Thor <author@example.com>
1057 Date: Thu Apr 7 15:27:13 2005 -0700
6956f858 1058
908a3203 1059 ${indent}15th
6956f858 1060
b408cf8c 1061 commit $parent
908a3203
JH
1062 Author: A U Thor <author@example.com>
1063 Date: Thu Apr 7 15:26:13 2005 -0700
6956f858 1064
908a3203
JH
1065 ${indent}14th
1066 EOF
29a40b5a
DL
1067 from=$(git rev-parse HEAD~3) &&
1068 to=$(git rev-parse HEAD^) &&
1069 echo "$from" "$to" >copy &&
1070 from=$(git rev-parse HEAD~2) &&
1071 to=$(git rev-parse HEAD) &&
1072 echo "$from" "$to" >>copy &&
1073 git notes copy --for-rewrite=foo <copy &&
908a3203
JH
1074 git log -2 >actual &&
1075 test_cmp expect actual
6956f858
TR
1076'
1077
6956f858 1078test_expect_success 'git notes copy --for-rewrite (enabled)' '
b408cf8c 1079 commit=$(git rev-parse HEAD) &&
1080 parent=$(git rev-parse HEAD^) &&
908a3203 1081 cat >expect <<-EOF &&
b408cf8c 1082 commit $commit
908a3203
JH
1083 Author: A U Thor <author@example.com>
1084 Date: Thu Apr 7 15:27:13 2005 -0700
1085
1086 ${indent}15th
1087
1088 Notes:
1089 ${indent}yet another note
1090 ${indent}
1091 ${indent}yet another note
1092
b408cf8c 1093 commit $parent
908a3203
JH
1094 Author: A U Thor <author@example.com>
1095 Date: Thu Apr 7 15:26:13 2005 -0700
1096
1097 ${indent}14th
1098
1099 Notes:
1100 ${indent}other note
1101 ${indent}
1102 ${indent}yet another note
1103 EOF
1104 test_config notes.rewriteMode overwrite &&
1105 test_config notes.rewriteRef "refs/notes/*" &&
29a40b5a
DL
1106 from=$(git rev-parse HEAD~3) &&
1107 to=$(git rev-parse HEAD^) &&
1108 echo "$from" "$to" >copy &&
1109 from=$(git rev-parse HEAD~2) &&
1110 to=$(git rev-parse HEAD) &&
1111 echo "$from" "$to" >>copy &&
1112 git notes copy --for-rewrite=foo <copy &&
908a3203
JH
1113 git log -2 >actual &&
1114 test_cmp expect actual
6956f858
TR
1115'
1116
1117test_expect_success 'git notes copy --for-rewrite (disabled)' '
908a3203 1118 test_config notes.rewrite.bar false &&
29a40b5a
DL
1119 from=$(git rev-parse HEAD~3) &&
1120 to=$(git rev-parse HEAD) &&
1121 echo "$from" "$to" >copy &&
1122 git notes copy --for-rewrite=bar <copy &&
908a3203
JH
1123 git log -2 >actual &&
1124 test_cmp expect actual
6956f858
TR
1125'
1126
908a3203 1127test_expect_success 'git notes copy --for-rewrite (overwrite)' '
b408cf8c 1128 commit=$(git rev-parse HEAD) &&
908a3203 1129 cat >expect <<-EOF &&
b408cf8c 1130 commit $commit
908a3203
JH
1131 Author: A U Thor <author@example.com>
1132 Date: Thu Apr 7 15:27:13 2005 -0700
6956f858 1133
908a3203 1134 ${indent}15th
6956f858 1135
908a3203
JH
1136 Notes:
1137 ${indent}a fresh note
1138 EOF
6956f858 1139 git notes add -f -m"a fresh note" HEAD^ &&
908a3203
JH
1140 test_config notes.rewriteMode overwrite &&
1141 test_config notes.rewriteRef "refs/notes/*" &&
29a40b5a
DL
1142 from=$(git rev-parse HEAD^) &&
1143 to=$(git rev-parse HEAD) &&
1144 echo "$from" "$to" >copy &&
1145 git notes copy --for-rewrite=foo <copy &&
908a3203
JH
1146 git log -1 >actual &&
1147 test_cmp expect actual
6956f858
TR
1148'
1149
1150test_expect_success 'git notes copy --for-rewrite (ignore)' '
908a3203
JH
1151 test_config notes.rewriteMode ignore &&
1152 test_config notes.rewriteRef "refs/notes/*" &&
29a40b5a
DL
1153 from=$(git rev-parse HEAD^) &&
1154 to=$(git rev-parse HEAD) &&
1155 echo "$from" "$to" >copy &&
1156 git notes copy --for-rewrite=foo <copy &&
908a3203
JH
1157 git log -1 >actual &&
1158 test_cmp expect actual
6956f858
TR
1159'
1160
6956f858 1161test_expect_success 'git notes copy --for-rewrite (append)' '
b408cf8c 1162 commit=$(git rev-parse HEAD) &&
908a3203 1163 cat >expect <<-EOF &&
b408cf8c 1164 commit $commit
908a3203
JH
1165 Author: A U Thor <author@example.com>
1166 Date: Thu Apr 7 15:27:13 2005 -0700
1167
1168 ${indent}15th
1169
1170 Notes:
1171 ${indent}a fresh note
1172 ${indent}
1173 ${indent}another fresh note
1174 EOF
6956f858 1175 git notes add -f -m"another fresh note" HEAD^ &&
908a3203
JH
1176 test_config notes.rewriteMode concatenate &&
1177 test_config notes.rewriteRef "refs/notes/*" &&
29a40b5a
DL
1178 from=$(git rev-parse HEAD^) &&
1179 to=$(git rev-parse HEAD) &&
1180 echo "$from" "$to" >copy &&
1181 git notes copy --for-rewrite=foo <copy &&
908a3203
JH
1182 git log -1 >actual &&
1183 test_cmp expect actual
6956f858
TR
1184'
1185
6956f858 1186test_expect_success 'git notes copy --for-rewrite (append two to one)' '
b408cf8c 1187 commit=$(git rev-parse HEAD) &&
908a3203 1188 cat >expect <<-EOF &&
b408cf8c 1189 commit $commit
908a3203
JH
1190 Author: A U Thor <author@example.com>
1191 Date: Thu Apr 7 15:27:13 2005 -0700
1192
1193 ${indent}15th
1194
1195 Notes:
1196 ${indent}a fresh note
1197 ${indent}
1198 ${indent}another fresh note
1199 ${indent}
1200 ${indent}append 1
1201 ${indent}
1202 ${indent}append 2
1203 EOF
6956f858
TR
1204 git notes add -f -m"append 1" HEAD^ &&
1205 git notes add -f -m"append 2" HEAD^^ &&
908a3203
JH
1206 test_config notes.rewriteMode concatenate &&
1207 test_config notes.rewriteRef "refs/notes/*" &&
29a40b5a
DL
1208 from=$(git rev-parse HEAD^) &&
1209 to=$(git rev-parse HEAD) &&
1210 echo "$from" "$to" >copy &&
1211 from=$(git rev-parse HEAD^^) &&
1212 to=$(git rev-parse HEAD) &&
1213 echo "$from" "$to" >>copy &&
1214 git notes copy --for-rewrite=foo <copy &&
908a3203
JH
1215 git log -1 >actual &&
1216 test_cmp expect actual
6956f858
TR
1217'
1218
1219test_expect_success 'git notes copy --for-rewrite (append empty)' '
1220 git notes remove HEAD^ &&
908a3203
JH
1221 test_config notes.rewriteMode concatenate &&
1222 test_config notes.rewriteRef "refs/notes/*" &&
29a40b5a
DL
1223 from=$(git rev-parse HEAD^) &&
1224 to=$(git rev-parse HEAD) &&
1225 echo "$from" "$to" >copy &&
1226 git notes copy --for-rewrite=foo <copy &&
908a3203
JH
1227 git log -1 >actual &&
1228 test_cmp expect actual
6956f858
TR
1229'
1230
6956f858 1231test_expect_success 'GIT_NOTES_REWRITE_MODE works' '
b408cf8c 1232 commit=$(git rev-parse HEAD) &&
908a3203 1233 cat >expect <<-EOF &&
b408cf8c 1234 commit $commit
908a3203
JH
1235 Author: A U Thor <author@example.com>
1236 Date: Thu Apr 7 15:27:13 2005 -0700
1237
1238 ${indent}15th
1239
1240 Notes:
1241 ${indent}replacement note 1
1242 EOF
1243 test_config notes.rewriteMode concatenate &&
1244 test_config notes.rewriteRef "refs/notes/*" &&
6956f858 1245 git notes add -f -m"replacement note 1" HEAD^ &&
29a40b5a
DL
1246 from=$(git rev-parse HEAD^) &&
1247 to=$(git rev-parse HEAD) &&
1248 echo "$from" "$to" >copy &&
1249 GIT_NOTES_REWRITE_MODE=overwrite git notes copy --for-rewrite=foo <copy &&
908a3203
JH
1250 git log -1 >actual &&
1251 test_cmp expect actual
6956f858
TR
1252'
1253
908a3203 1254test_expect_success 'GIT_NOTES_REWRITE_REF works' '
b408cf8c 1255 commit=$(git rev-parse HEAD) &&
908a3203 1256 cat >expect <<-EOF &&
b408cf8c 1257 commit $commit
908a3203
JH
1258 Author: A U Thor <author@example.com>
1259 Date: Thu Apr 7 15:27:13 2005 -0700
6956f858 1260
908a3203 1261 ${indent}15th
6956f858 1262
908a3203
JH
1263 Notes:
1264 ${indent}replacement note 2
1265 EOF
6956f858 1266 git notes add -f -m"replacement note 2" HEAD^ &&
908a3203
JH
1267 test_config notes.rewriteMode overwrite &&
1268 test_unconfig notes.rewriteRef &&
29a40b5a
DL
1269 from=$(git rev-parse HEAD^) &&
1270 to=$(git rev-parse HEAD) &&
1271 echo "$from" "$to" >copy &&
6956f858 1272 GIT_NOTES_REWRITE_REF=refs/notes/commits:refs/notes/other \
29a40b5a 1273 git notes copy --for-rewrite=foo <copy &&
908a3203
JH
1274 git log -1 >actual &&
1275 test_cmp expect actual
6956f858
TR
1276'
1277
1278test_expect_success 'GIT_NOTES_REWRITE_REF overrides config' '
6956f858 1279 git notes add -f -m"replacement note 3" HEAD^ &&
908a3203
JH
1280 test_config notes.rewriteMode overwrite &&
1281 test_config notes.rewriteRef refs/notes/other &&
29a40b5a
DL
1282 from=$(git rev-parse HEAD^) &&
1283 to=$(git rev-parse HEAD) &&
1284 echo "$from" "$to" >copy &&
dbe7b410 1285 GIT_NOTES_REWRITE_REF=refs/notes/commits \
29a40b5a 1286 git notes copy --for-rewrite=foo <copy &&
908a3203 1287 git log -1 >actual &&
dbe7b410 1288 grep "replacement note 3" actual
6956f858 1289'
bbb1b8a3
JK
1290
1291test_expect_success 'git notes copy diagnoses too many or too few parameters' '
8af69cf3
ĐTCD
1292 test_must_fail git notes copy 2>error &&
1293 test_i18ngrep "too few parameters" error &&
1294 test_must_fail git notes copy one two three 2>error &&
1295 test_i18ngrep "too many parameters" error
bbb1b8a3
JK
1296'
1297
e14c92e8
JK
1298test_expect_success 'git notes get-ref expands refs/heads/master to refs/notes/refs/heads/master' '
1299 test_unconfig core.notesRef &&
1300 sane_unset GIT_NOTES_REF &&
29a40b5a
DL
1301 echo refs/notes/refs/heads/master >expect &&
1302 git notes --ref=refs/heads/master get-ref >actual &&
1303 test_cmp expect actual
e14c92e8
JK
1304'
1305
618cd757 1306test_expect_success 'git notes get-ref (no overrides)' '
908a3203 1307 test_unconfig core.notesRef &&
ed40ec55 1308 sane_unset GIT_NOTES_REF &&
29a40b5a
DL
1309 echo refs/notes/commits >expect &&
1310 git notes get-ref >actual &&
1311 test_cmp expect actual
618cd757
JH
1312'
1313
1314test_expect_success 'git notes get-ref (core.notesRef)' '
908a3203 1315 test_config core.notesRef refs/notes/foo &&
29a40b5a
DL
1316 echo refs/notes/foo >expect &&
1317 git notes get-ref >actual &&
1318 test_cmp expect actual
618cd757
JH
1319'
1320
1321test_expect_success 'git notes get-ref (GIT_NOTES_REF)' '
29a40b5a
DL
1322 echo refs/notes/bar >expect &&
1323 GIT_NOTES_REF=refs/notes/bar git notes get-ref >actual &&
1324 test_cmp expect actual
618cd757
JH
1325'
1326
1327test_expect_success 'git notes get-ref (--ref)' '
29a40b5a
DL
1328 echo refs/notes/baz >expect &&
1329 GIT_NOTES_REF=refs/notes/bar git notes --ref=baz get-ref >actual &&
1330 test_cmp expect actual
618cd757
JH
1331'
1332
d0923b6d
JH
1333test_expect_success 'setup testing of empty notes' '
1334 test_unconfig core.notesRef &&
1335 test_commit 16th &&
d73a5b93
JH
1336 empty_blob=$(git hash-object -w /dev/null) &&
1337 echo "$empty_blob" >expect_empty
d0923b6d
JH
1338'
1339
1340while read cmd
1341do
1342 test_expect_success "'git notes $cmd' removes empty note" "
1343 test_might_fail git notes remove HEAD &&
1344 MSG= git notes $cmd &&
1345 test_must_fail git notes list HEAD
1346 "
d73a5b93
JH
1347
1348 test_expect_success "'git notes $cmd --allow-empty' stores empty note" "
1349 test_might_fail git notes remove HEAD &&
1350 MSG= git notes $cmd --allow-empty &&
1351 git notes list HEAD >actual &&
1352 test_cmp expect_empty actual
1353 "
d0923b6d
JH
1354done <<\EOF
1355add
1356add -F /dev/null
1357add -m ""
1358add -c "$empty_blob"
1359add -C "$empty_blob"
1360append
1361append -F /dev/null
1362append -m ""
1363append -c "$empty_blob"
1364append -C "$empty_blob"
1365edit
1366EOF
1367
8a4acd69
JH
1368test_expect_success 'empty notes are displayed by git log' '
1369 test_commit 17th &&
1370 git log -1 >expect &&
908a3203 1371 cat >>expect <<-EOF &&
8a4acd69 1372
908a3203
JH
1373 Notes:
1374 EOF
8a4acd69
JH
1375 git notes add -C "$empty_blob" --allow-empty &&
1376 git log -1 >actual &&
1377 test_cmp expect actual
1378'
1379
65d9fb48 1380test_done