From: Junio C Hamano Date: Wed, 29 Aug 2007 20:15:55 GMT Subject: Re: git-svn tags and branches Message-ID: <7vhcmip05g.fsf@gitster.siamese.dyndns.org> In-Reply-To: "Giuseppe Bilotta" writes: > On 8/29/07, Junio C Hamano wrote: >> "Giuseppe Bilotta" writes: >> >> > BTW can git have a tag and a branch with the same name? If >> > not,... >> >> This is "Yes but". >> >> You can have a tag foo and branch foo. > > [snip] > >> You can clarify yourself to avoid ambiguity like so: >> >> . git branch newbranch heads/foo ;# I mean "branch from foo branch" >> . git log tags/foo ;# "show history starting at that tag" > > Ok. So assuming we import a svn repo which has a tag and a branch > called 'name', and that there are post-tag commits in tags/name, how > do we call the stuff? > > We could call 'name' both the (annotated) tag and the branch, but what > name would we use for the branch created by post-tag commits? That's the "Yes but" part. You need to know what you are doing. As I said in the part you quoted, if you have branch foo and tag foo, and if you are interested in talking about the tag 'foo', you say "tag/foo". When you want to talk about the branch, you say "heads/foo". Replace "foo" with "name" and I think you get your answer.