archive mirror
 help / color / mirror / Atom feed
From: Mark Brown <>
To: Linus Torvalds <>
Cc:, Liam Girdwood <>
Subject: Re: Regulator update for 3.3
Date: Mon, 30 Jan 2012 17:43:45 +0000	[thread overview]
Message-ID: <> (raw)
In-Reply-To: <>

[-- Attachment #1: Type: text/plain, Size: 1106 bytes --]

On Mon, Jan 30, 2012 at 09:14:56AM -0800, Linus Torvalds wrote:
> On Mon, Jan 30, 2012 at 5:42 AM, Mark Brown

> > are available in the git repository at:

> >  git:// for-linus

> "Already up-to-date."

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

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.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

  reply	other threads:[~2012-01-30 17:43 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-01-30 13:42 Regulator update for 3.3 Mark Brown
2012-01-30 17:14 ` Linus Torvalds
2012-01-30 17:43   ` Mark Brown [this message]
2012-01-30 18:22     ` Linus Torvalds
2012-01-30 18:51       ` Mark Brown
2012-02-01  5:00         ` Junio C Hamano
2012-02-01  9:54           ` Mark Brown

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \ \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).