From: Kees Cook <keescook@chromium.org>
To: Konstantin Ryabitsev <konstantin@linuxfoundation.org>
Cc: tools@linux.kernel.org, users@linux.kernel.org
Subject: Re: merging pull requests
Date: Fri, 1 Oct 2021 17:11:40 -0700 [thread overview]
Message-ID: <202110011709.1E20209@keescook> (raw)
In-Reply-To: <20211001182615.bcyuag7vfrkzhefj@meerkat.local>
On Fri, Oct 01, 2021 at 02:26:15PM -0400, Konstantin Ryabitsev wrote:
> On Thu, Sep 30, 2021 at 04:09:13PM -0700, Kees Cook wrote:
> > I think so -- that seems to be sort of what Linus does? There seem to be
> > a few templates (tag, branch, and "patches from Andrew"), e.g.:
> >
> > Merge tag 'char-misc-5.15-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
> > Merge branch 'misc.namei' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
> > Merge branch 'akpm' (patches from Andrew)
> >
> > Though I'd love to know why there's a distinction between "tag" and
> > "branch" here. Are "branch" pulls not checked for signatures?
>
> That's just what git does when you merge FETCH_HEAD. It takes the contents of
> .git/FETCH_HEAD, which describe from where the last fetch happened. If you
> fetch a tag, it will say:
>
> [tipsha]\t\ttag 'tagname' of url://of/remote/tree
>
> if you fetch a branch, it will be
>
> [tipsha]\t\tbranch 'branchanme' of url://of/remote/tree
>
> When merging FETCH_HEAD, git will just say "Merge %s" with the contents of
> .git/FETCH_HEAD file for that tip.
>
> When you merge a local branch instead of FETCH_HEAD, it will default to:
>
> Merge branch 'localbranchname'
Gotcha. I remain curious about the process of between the pull (which
puts it into FETCH_HEAD) and the merge (with merges FETCH_HEAD into the
current branch), when I would expect there to be an intermediate step of
checking FETCH_HEAD out into a branch for review, build, test, etc.
But, I guess, nothing would actually move FETCH_HEAD in that case, so
that's why it shows up that way.
--
Kees Cook
prev parent reply other threads:[~2021-10-02 0:11 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
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 [this message]
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=202110011709.1E20209@keescook \
--to=keescook@chromium.org \
--cc=konstantin@linuxfoundation.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.