linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Bjorn Helgaas <helgaas@kernel.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: linux-pci@vger.kernel.org,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Subject: Re: [GIT PULL] PCI changes for v5.6
Date: Sat, 1 Feb 2020 12:37:19 -0600	[thread overview]
Message-ID: <20200201183719.GA6704@google.com> (raw)
In-Reply-To: <CAHk-=wjxMB3UYR5iUHB6+NXT7awOF4DD5=QQrskJ8yocyO+Ebw@mail.gmail.com>

On Fri, Jan 31, 2020 at 02:49:52PM -0800, Linus Torvalds wrote:
> On Fri, Jan 31, 2020 at 2:34 PM Bjorn Helgaas <helgaas@kernel.org> wrote:
> >
> >   git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git 01b810ed7187
> 
> You must have screwed up your git request-pull somehow.
> 
> Yes, yes, the above works, and a branch is just a named SHA1. You can
> give the SHA1 directly.
> 
> But it's not what you meant to do, I'm sure. Especially since you
> pointed to the SHA1 of the top commit, not the tag that you have that
> points to it.
> 
> I can see what you _meant_ to ask me to pull with "git ls-remote". I
> clearly should - and will - pull the 'pci-v5.6-changes' tag, which
> points to that commit.
> 
> But can you check what in your workflow went wrong for the above to happen?

Oooh, I'm sorry, that's my fault; I did screw it up.  I usually do
this:

  git request-pull origin/master git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git $COMMIT > msg.txt
  git tag -s $TAG $COMMIT
  git push pci $TAG
  git request-pull origin/master git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git $TAG > msg.txt

so I can look over the updates one last time before tagging, but I got
distracted in the middle and I think I forgot to do the second
request-pull after pushing the tag.

Thanks for compensating.

Bjorn

  reply	other threads:[~2020-02-01 18:37 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-01-31 22:34 Bjorn Helgaas
2020-01-31 22:49 ` Linus Torvalds
2020-02-01 18:37   ` Bjorn Helgaas [this message]
2020-01-31 23:10 ` pr-tracker-bot

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:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

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

  git send-email \
    --in-reply-to=20200201183719.GA6704@google.com \
    --to=helgaas@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pci@vger.kernel.org \
    --cc=lorenzo.pieralisi@arm.com \
    --cc=torvalds@linux-foundation.org \
    --subject='Re: [GIT PULL] PCI changes for v5.6' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

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