All of lore.kernel.org
 help / color / mirror / Atom feed
From: Konstantin Ryabitsev <konstantin@linuxfoundation.org>
To: Kees Cook <keescook@chromium.org>
Cc: tools@linux.kernel.org, users@linux.kernel.org
Subject: Re: merging pull requests
Date: Thu, 30 Sep 2021 16:00:02 -0400	[thread overview]
Message-ID: <20210930200002.67vxbowvegso2zhg@meerkat.local> (raw)
In-Reply-To: <202109301023.B78ABE54B@keescook>

On Thu, Sep 30, 2021 at 10:33:56AM -0700, Kees Cook wrote:
> Hi!
> 
> I'm just realized that all my workflows have been entirely mbox patch
> sets, and I finally have a pull request to take, and ... I have no idea
> how to do it "right". :P
> 
> I see "b4 pr", but I was hoping for some kind of three-step process:
> 1) get the code
> 2) read/verify/test code
> 3) merge code into main brain

Glad you're still around and doing well, professor Nightingale. ;)

I'm going to cc this to users@, since it's likely to reach more
maintainers' eyes (and brains) there.

> And that it would end up looking like what I see from Linus (i.e. naming
> branching after the tags sent, etc):
> 
> 6e439bbd436e Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
> a4e6f95a891a Merge tag 'pinctrl-v5.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl
> 62da74a73570 Merge tag 'vfio-v5.15-rc4' of git://github.com/awilliam/linux-vfio
> e7bd807e8c9e Merge tag 'm68k-for-v5.15-tag3' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
> dca50f08a03e Merge tag 'nios2_fixes_for_v5.15_part1' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux
> 
> It seems like "b4 pr" does part of step 1, but doesn't build a branch
> from the tag (though one can use "-b").
> 
> And for step 3, when I do a "git merge --no-ff $branch", all the tag and
> origin (e.g. "tag 'pinctrl-v5.15-2' of git://..." is missing).

It shouldn't be if you leave it in FETCH_HEAD, which is what b4 does by
default. So, if you do "b4 pr" and then follow it by "git merge", it should
retain the pull request origin and make it the default subject there.

I just added some merge message template processing for "b4 shazam", so we can
probably do the same for "b4 pr" if that makes sense. Should b4 grab the
contents of the pull request and pre-stuff them into a file you can pass to
git-merge?

-K

  reply	other threads:[~2021-09-30 20:00 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-30 17:33 merging pull requests Kees Cook
2021-09-30 20:00 ` Konstantin Ryabitsev [this message]
2021-09-30 23:09   ` Kees Cook
2021-09-30 23:22     ` Stephen Rothwell
2021-09-30 23:29       ` Kees Cook
2021-09-30 23:29     ` Stephen Rothwell
2021-09-30 23:42       ` Kees Cook
2021-10-01 11:59         ` Jason Gunthorpe
2021-10-02  0:15           ` Kees Cook
2021-10-01 17:01         ` Steven Rostedt
2021-10-01 17:07         ` James Bottomley
2021-10-02  0:17           ` Kees Cook
2021-10-01 17:19         ` Konstantin Ryabitsev
2021-10-02  2:35           ` Kees Cook
2021-09-30 23:31     ` Olof Johansson
2021-10-01  0:09       ` Kees Cook
2021-10-01  0:27         ` Olof Johansson
2021-10-01 17:05           ` Steven Rostedt
2021-10-02  0:12             ` Kees Cook
2021-10-01 18:26     ` Konstantin Ryabitsev
2021-10-01 18:47       ` Linus Torvalds
2021-10-01 19:30         ` Konstantin Ryabitsev
2021-10-02  0:08           ` Kees Cook
2021-10-02  6:22         ` Willy Tarreau
2021-10-02  0:11       ` Kees Cook

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=20210930200002.67vxbowvegso2zhg@meerkat.local \
    --to=konstantin@linuxfoundation.org \
    --cc=keescook@chromium.org \
    --cc=tools@linux.kernel.org \
    --cc=users@linux.kernel.org \
    /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
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.