From: Fabio Aiuto <fabioaiuto83@gmail.com>
To: Miguel Ojeda <miguel.ojeda.sandonis@gmail.com>
Cc: rust-for-linux <rust-for-linux@vger.kernel.org>
Subject: Re: workflow
Date: Sun, 9 May 2021 19:37:21 +0200 [thread overview]
Message-ID: <20210509173720.GA1422@agape.jhs> (raw)
In-Reply-To: <CANiq72noFoTnKtnoW_UUpXHUTcpw5iJcc8ZeU77m4ef1L8KoYg@mail.gmail.com>
On Sun, May 09, 2021 at 02:13:13PM +0200, Miguel Ojeda wrote:
> Hi Fabio,
>
> On Sun, May 9, 2021 at 9:34 AM Fabio Aiuto <fabioaiuto83@gmail.com> wrote:
> >
> > One misterious to me side effect is that the command `git show` on HEAD
> > pointing to a PR doesn't show diffs.
>
> That is because they are merge commits (i.e. a commit with more than
> one parent). `git show` may show a "combined diff" in such a case. For
> instance, it does right now with the current commit `rust` is pointing
> to, i.e. commit 99bec9d3476d ("Merge pull request #227 from
> Kloenk/ra").
>
> See e.g. https://stackoverflow.com/questions/40986518/git-show-of-a-merge-commit
> for a detailed explanation.
>
> But you are 100% right! The tree does not look like other ones in the
> kernel. If you take a look into the other branch (the one I manually
> prepare, `rust-next`), it looks like you would expect (and does not
> contain GitHub files etc.).
>
> In order to fix this (plus a few other benefits), we will have a
> better workflow soon (as soon as I get some time to prepare it, say a
> few weeks).
>
> > After these two enlightening informal meetings I realized that, for this
> > particular project, I must (and I'm happy to do it) align with you all
>
> It is not a hard requirement -- you can send patches to this mailing
> list and I will gladly take them!
>
> The technical benefits of using GitHub for us are the issue tracker
> and the CI, mainly.
>
> > using GitHub. Is there a particular join procedure you recommend?
>
> Using GitHub if you already know Git and the kernel workflow is very easy:
>
> - `git push` your changes to your "forked repo" in GitHub.
>
> - Create a pull request in the web interface.
>
> That should be pretty much it.
>
> Cheers,
> Miguel
thank you so much Miguel, that's all I wanted to know :)
fabio
prev parent reply other threads:[~2021-05-09 17:37 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-09 7:33 workflow Fabio Aiuto
2021-05-09 9:31 ` workflow Geert Stappers
2021-05-09 10:42 ` workflow Fabio Aiuto
2021-05-09 12:13 ` workflow Miguel Ojeda
2021-05-09 17:37 ` Fabio Aiuto [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=20210509173720.GA1422@agape.jhs \
--to=fabioaiuto83@gmail.com \
--cc=miguel.ojeda.sandonis@gmail.com \
--cc=rust-for-linux@vger.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 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).