With the recent change to allow notes refs to be located in the refs hierarchy in locations other than refs/notes/ the 'git notes merge refs/heads/master' test started succeeding.
Previously refs/heads/master would have been expanded to a non-existing, ref refs/notes/refs/heads/master, and the merge would have failed (as expected). Now, however, since refs/heads/master exists and the new, more relaxed notes refs rules leave it unchanged, the merge succeeds. This has a follow-on effect which makes the next two tests fail as well. The refs/heads/master ref could just be replaced with another ref name that does not exist such as refs/heads/xmaster, but there are already several tests using non-existant refs so instead just remove the refs/heads/master line. Suggested-by: Johan Herland <[email protected]> Signed-off-by: Kyle J. McKay <[email protected]> --- t/t3308-notes-merge.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/t/t3308-notes-merge.sh b/t/t3308-notes-merge.sh index 24d82b49..f0feb64b 100755 --- a/t/t3308-notes-merge.sh +++ b/t/t3308-notes-merge.sh @@ -90,7 +90,6 @@ test_expect_success 'fail to merge various non-note-trees' ' test_must_fail git notes merge refs/notes/ && test_must_fail git notes merge refs/notes/dir && test_must_fail git notes merge refs/notes/dir/ && - test_must_fail git notes merge refs/heads/master && test_must_fail git notes merge x: && test_must_fail git notes merge x:foo && test_must_fail git notes merge foo^{bar -- 2.1.4 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
