t3308: create a real ref directory/file conflict
authorJeff King <peff@peff.net>
Fri, 6 Oct 2017 14:38:30 +0000 (10:38 -0400)
committerJunio C Hamano <gitster@pobox.com>
Sat, 7 Oct 2017 01:31:52 +0000 (10:31 +0900)
commitf2515d919e66d4711e50dcc774c47393ba1704ab
treeb9ed77210e08fef1f7da6fc8a4eaded547c1503e
parent217f2767cbcb562872437eed4dec62e00846d90c
t3308: create a real ref directory/file conflict

A test in t3308 wants to make sure that we don't
accidentally merge into "refs/notes/dir" when it exists as a
directory, so it does:

  mkdir .git/refs/notes/dir
  git -c core.notesRef=refs/notes/dir merge ...

and expects the second command to fail. But that
understimates the refs code, which is smart enough to remove
useless directories in the refs hierarchy. The test
succeeded only because of a bug which prevented resolving
refs/notes/dir for writing, even though an actual ref update
would succeed.

In preparation for fixing that bug, let's switch to creating
a real ref in refs/notes/dir, which is a more realistic
situation.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t3308-notes-merge.sh