Subject: Re: howto handle name clashes

From: Sven Strickroth <[email-masked]>
Date: Fri, 23 Mar 2012 18:43:37 +0100

Am 23.03.2012 18:12 schrieb Jeff King:
>> - 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"?

yes. Your example was the correct one. Thanks for spotting my problem.

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

seems to work. Thanks.

Really problematic is checkout:
"git checkout heads/foo" creates a detached HEAD (is this intended).
However, "git checkout heads/foo -B foo" can be used.

Is there a git command to find out if a name is ambiguous?
"git rev-parse foo" outputs "warning: refname 'test' is ambiguous.", but
the return code is zero.

-- 
Best regards,
 Sven Strickroth
 ClamAV, a GPL anti-virus toolkit   http://www.clamav.net
 PGP key id F5A9D4C4 @ any key-server