Re: howto handle name clashes

From: Jeff King <peff@peff.net>
Date: Mar 23, 2012, 17:12 UTC
Message-ID: <20120323171219.GB12881@sigill.intra.peff.net>
In-Reply-To: <4F6C7539.3080607@tu-clausthal.de>

On Fri, Mar 23, 2012 at 02:06:01PM +0100, Sven Strickroth wrote:

> how to handle name clashes for branches and tags? Is there anything I
> can add to the refspec to make the name unique?

You can always use a more fully-qualified name to disambiguate (e.g., "tags/foo", or "refs/tags/foo").

> - for merging "git merge --no-ff refs/branches/test" works, but
> generates a not so nice default merge message. ("merged  commit
> refs/branches/test" instead of "merged branch test")

Did you mean "refs/heads/test"?

I would have thought we would full-qualify the refname first, and then use that to determine the message. Doing a simple test, it looks like "git merge foo" gets you "Merge branch 'foo'", but "git merge heads/foo" will get you "Merge branch 'heads/foo'". We should be able to do better in the latter case.

> - how to drop a remote tag/branch ("git push origin :test" does not work)

Does "git push origin :heads/foo" (or :tags/foo) not work?

-Peff