Skip to content

Commit af152bd

Browse files
committed
Merge branch 'js/t3301-unbreak-notes-test'
Test fix. * js/t3301-unbreak-notes-test: t3301: fix false negative
2 parents c42986f + dbe7b41 commit af152bd

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

t/t3301-notes.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1120,9 +1120,10 @@ test_expect_success 'GIT_NOTES_REWRITE_REF overrides config' '
11201120
test_config notes.rewriteMode overwrite &&
11211121
test_config notes.rewriteRef refs/notes/other &&
11221122
echo $(git rev-parse HEAD^) $(git rev-parse HEAD) |
1123-
GIT_NOTES_REWRITE_REF= git notes copy --for-rewrite=foo &&
1123+
GIT_NOTES_REWRITE_REF=refs/notes/commits \
1124+
git notes copy --for-rewrite=foo &&
11241125
git log -1 >actual &&
1125-
test_cmp expect actual
1126+
grep "replacement note 3" actual
11261127
'
11271128

11281129
test_expect_success 'git notes copy diagnoses too many or too few parameters' '

0 commit comments

Comments
 (0)