Merge branch 'js/t3301-unbreak-notes-test'

Test fix.

* js/t3301-unbreak-notes-test:
  t3301: fix false negative
This commit is contained in:
Junio C Hamano 2019-04-25 16:41:21 +09:00
commit af152bd5b0

View File

@ -1120,9 +1120,10 @@ test_expect_success 'GIT_NOTES_REWRITE_REF overrides config' '
test_config notes.rewriteMode overwrite && test_config notes.rewriteMode overwrite &&
test_config notes.rewriteRef refs/notes/other && test_config notes.rewriteRef refs/notes/other &&
echo $(git rev-parse HEAD^) $(git rev-parse HEAD) | echo $(git rev-parse HEAD^) $(git rev-parse HEAD) |
GIT_NOTES_REWRITE_REF= git notes copy --for-rewrite=foo && GIT_NOTES_REWRITE_REF=refs/notes/commits \
git notes copy --for-rewrite=foo &&
git log -1 >actual && git log -1 >actual &&
test_cmp expect actual grep "replacement note 3" actual
' '
test_expect_success 'git notes copy diagnoses too many or too few parameters' ' test_expect_success 'git notes copy diagnoses too many or too few parameters' '