linux-kernel - Re: GIT and the current -stable

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <Pine.LNX.4.64.0704141028460.5473@woody.linux-foundation.org>
Date:	Sat, 14 Apr 2007 10:34:20 -0700 (PDT)
From:	Linus Torvalds <torvalds@...ux-foundation.org>
To:	Junio C Hamano <junkio@....net>
cc:	Rene Herman <rene.herman@...il.com>,
	Linux Kernel <linux-kernel@...r.kernel.org>,
	Greg KH <greg@...ah.com>, git@...r.kernel.org
Subject: Re: GIT and the current -stable

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
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/