From: Jonathan Nieder <jrnieder@gmail.com>
Date: Tue, 17 Aug 2010 06:52:48 +0000 (-0500)
Subject: merge: do not mistake (ancestor of) tag for branch
X-Git-Tag: v1.7.3-rc0~16^2~23
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b81f925f709a10b37fb4fcd03629b55bc890a478?ds=inline;hp=b81f925f709a10b37fb4fcd03629b55bc890a478

merge: do not mistake (ancestor of) tag for branch

If no branch 'foo' exists but a tag 'foo' does, then
git merge foo^ results in

Merge branch 'foo' (early part)

as a commit message, because the relevant code path checks that
refs/heads/foo is a valid refname for writing rather than for
reading.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---