diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-04-25 16:41:21 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-04-25 16:41:22 +0900 |
| commit | af152bd5b04933239f338044d43e63b549b97ea6 (patch) | |
| tree | 2e5c7874b831f1f8c2c41760d929ac4537cfa78b | |
| parent | Merge branch 'tz/doc-apostrophe-no-longer-needed' (diff) | |
| parent | t3301: fix false negative (diff) | |
| download | tgif-af152bd5b04933239f338044d43e63b549b97ea6.tar.xz | |
Merge branch 'js/t3301-unbreak-notes-test'
Test fix.
* js/t3301-unbreak-notes-test:
t3301: fix false negative
| -rwxr-xr-x | t/t3301-notes.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/t/t3301-notes.sh b/t/t3301-notes.sh index 84bbf88cf9..704bbc6541 100755 --- a/t/t3301-notes.sh +++ b/t/t3301-notes.sh @@ -1120,9 +1120,10 @@ test_expect_success 'GIT_NOTES_REWRITE_REF overrides config' ' test_config notes.rewriteMode overwrite && test_config notes.rewriteRef refs/notes/other && 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 && - test_cmp expect actual + grep "replacement note 3" actual ' test_expect_success 'git notes copy diagnoses too many or too few parameters' ' |