From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 25 Apr 2019 07:41:21 +0000 (+0900)
Subject: Merge branch 'js/t3301-unbreak-notes-test'
X-Git-Tag: v2.22.0-rc0~46
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/af152bd5b04933239f338044d43e63b549b97ea6?hp=c42986f41caf673aa5536df8cae980969a063f3f

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

Test fix.

* js/t3301-unbreak-notes-test:
t3301: fix false negative
---

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' '