Skip to contentSkip to conversation

workflow

DISCUSSION Fabio Aiuto 3 participants 5 messages May 9, 2021 Rust

lore
Share & tools
lore
#0 lore raw

Good morning all,

I need some clarifications about the workflow.

As a newcomer in kernel development and open source development in general I got a little used to with the forkflow in Greg's staging subsystem.

The tool I'm used to work with is, at the moment, command line git against Greg's tree.

I tried to apply the same approach on rust-for-linux tree but I noticed some differences, first of all the use of GitHub.

One misterious to me side effect is that the command git show on HEAD pointing to a PR doesn't show diffs.

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 using GitHub. Is there a particular join procedure you recommend?

thank you,

fabio

#1 lore raw
Quoted 1 line · Fabio Aiuto

Good morning all,

Hail all time zones,

Quoted 12 lines

I need some clarifications about the workflow.

As a newcomer in kernel development and open source development in general I got a little used to with the forkflow in Greg's staging subsystem.

The tool I'm used to work with is, at the moment, command line git against Greg's tree.

I tried to apply the same approach on rust-for-linux tree but I noticed some differences, first of all the use of GitHub.

Quoted 6 lines

One misterious to me side effect is that the command git show on HEAD pointing to a PR doesn't show diffs.

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 using GitHub. Is there a particular join procedure you recommend?

I think original poster
is not aware of "Rust for Linux" already in the next branch.

Quoted 1 line

thank you,

My appology for this way too short message.

Quoted 1 line

fabio

Groeten
Geert Stappers

Signature · 1 line
Silence is hard to parse
#2 lore raw
Quoted 21 lines · Geert Stappers
Quoted 1 line · Fabio Aiuto

Good morning all,

Hail all time zones,

Quoted 15 lines

I need some clarifications about the workflow.

As a newcomer in kernel development and open source development in general I got a little used to with the forkflow in Greg's staging subsystem.

The tool I'm used to work with is, at the moment, command line git against Greg's tree.

I tried to apply the same approach on rust-for-linux tree but I noticed some differences, first of all the use of GitHub.

One misterious to me side effect is that the command git show on HEAD pointing to a PR doesn't show diffs.

Quoted 6 lines
Quoted 3 lines

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 using GitHub. Is there a particular join procedure you recommend?

I think original poster
is not aware of "Rust for Linux" already in the next branch.

ok I will search on Google what does it means, for sure it's more friendly even if it requires an account

Quoted 5 lines
Quoted 4 lines

thank you,

Quoted 10 lines

My appology for this way too short message.

Quoted 1 line

fabio

Groeten
Geert Stappers

Signature · 1 line
Silence is hard to parse

thank you,

fabio

#3 lore raw
In reply to Fabio Aiuto

Hi Fabio,

Quoted 3 lines · Fabio Aiuto

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

Quoted 2 lines

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.

Quoted 1 line

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

#4 lore raw
Quoted 38 lines · Miguel Ojeda

Hi Fabio,

Quoted 3 lines · Fabio Aiuto

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

Quoted 2 lines

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.

Quoted 1 line

using GitHub. Is there a particular join procedure you recommend?

Using GitHub if you already know Git and the kernel workflow is very easy:

Quoted 8 lines

- 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