Thread (5 messages) 5 messages, 5 authors, 2007-04-14

Re: GIT and the current -stable

From: Linus Torvalds <torvalds@linux-foundation.org>
Date: 2007-04-14 17:34:26
Also in: lkml


On Fri, 13 Apr 2007, Junio C Hamano wrote:
I think adding these lines to .git/config would do the trick,
after you have done the "checkout -b v2.6.20 v2.6.20" step:

[branch "v2.6.20"]
	remote = stable
	merge = refs/heads/master
Please don't do this. Using the same name for a branch as for a tag is 
madness. Call it "v2.6.20-stable" or anything else, but don't re-use the 
same naming as for tags.

Sure, git will have some random well-defined order of parsing which one 
"v2.6.20" actually means in any particular context (usually the tag-name 
will take precedence, except for contexts where the branchname is 
required!), and yeah, you can always make things unambiguous by specifying 
the full name (ie say "[refs/]tags/v2.6.20" when you want to make sure 
it's unambiguously the tag, not the branch) but it's still guaranteed to 
cause confusion at *some* level, if only for the user.

So just don't do it. 

		Linus
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help