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
| ||
|
Date: Mon, 30 Jan 2012 10:22:28 -0800 From: Linus Torvalds <torvalds@...ux-foundation.org> To: Mark Brown <broonie@...nsource.wolfsonmicro.com> Cc: linux-kernel@...r.kernel.org, Liam Girdwood <lrg@...com> Subject: Re: Regulator update for 3.3 On Mon, Jan 30, 2012 at 9:43 AM, Mark Brown <broonie@...nsource.wolfsonmicro.com> wrote: > >> Forgot to push? > > Not quite, I had pushed a new signed tag but I hadn't deleted the old > for-linus branch (which you had merged). Since git prefers branches > to tags when pulling it was looking at the old branch and ignoring the > signed tag. Should be cleaned up now, at least I deleted the branch and > everything looks OK in gitweb. Ok. You could also have asked me to pull "tags/for-linus" to disambiguate. That has the advantage that I think it even works with older versions of git - they'll get the tag, then ignore the tag information, and do the merge of just the commit the tag points to. > I actually noticed this with some other things I was doing, what I think > I want git to do when working with signed tags is allow me to have a tag > with the same name as the branch and prefer the tag rather than the > branch. That way I can tell people to pull from a given name and it'll > do the right thing if they're using a git that understands pulling from > tags or not. Either that or complain bitterly and mock me if I'm so > foolish as to have a tag and branch with the same name. I won't mock you (*this* time), but I think the "tags/for-linus" approach is better, as it should work regardless of git version. 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/
Powered by blists - more mailing lists