Few changes to the instructions how to compile a new kernel #1

halcon74 · 2020-09-20T12:17:50Z

Hi Ramon,

I am learning to make PRs... :)

I tried to make this PR especially for cherry-picking and, I need to say, it's not that easy.

I think in this case the best approach can be:

To write the complete new version of the file separately
Copy/Paste the lines from up to bottom, trying to split changes to the proper blocks, committing each block

And even then there will arise conflicts. For example, I rename a section and move this section up. OK, I split it to two steps... But if you like to merge the second step, not first, there will be a conflict :)

EDIT: IMHO, it contradicts the essence of a VCS; it's better to make multiple PRs.

halcon74 · 2020-09-20T12:27:43Z

How did you submit the reviews?

usr/src/README

halcon74 · 2020-09-20T12:50:28Z

Experimenting: I used the same blue button on your commit, adding this README, and it resulted in a similar review.

halcon74 · 2020-09-20T12:59:41Z

A note: the review that I submitted for the lines about Grub, is shown not only in that commit where I submitted the review, but in the last one too (because one of the lines about Grub is shown there too) :) GitHub whistles :)

keks24 · 2020-09-21T09:10:16Z

And even then there will arise conflicts.

These might happen. I am going to fix them, since I am the owner of the repository.

EDIT: IMHO, it contradicts the essence of a VCS; it's better to make multiple PRs.

I do not think so. Every commit is documented and I can choose to take all changes, pick some of them or reject everything.

Other pull requests would make sense, if it refers to another issue or topic.

Apropos issues: It is always good to report an issue and combine it with a pull request. Good examples I made so far:

Gitea
- Issue
- Pull request
Ansible (without pull request, since I do not know how to program in Python properly)
- Issue
- Repository to reproduce the issue

Edit - 20200921:
Oh no. By adding the links of the issues here, GitHub automatically referenced them. Shit happens. :D

By the way: Since this is a mirror repository from my internal Gitea instance, I am going to do some experiments here and then adapt the changes locally, so your pull request might disappear here.

keks24 · 2020-09-21T09:39:15Z

Concerning "how to checkout a pull request": On the upper right corner, there is a button called Open with. You can then check out the pull request via gh pr checkout <pull_request_number>. I totally forgot, that GitHub recently implemented a feature to manage GitHub repositories via CLI.

halcon74 · 2020-09-21T10:21:12Z

Apropos issues: It is always good to report an issue and combine it with a pull request. Good examples I made so far:

Thanks. I'll keep it in mind.

Edit - 20200921:
Oh no. By adding the links of the issues here, GitHub automatically referenced them. Shit happens. :D

I'll keep it in mind too :D

By the way: Since this is a mirror repository from my internal Gitea instance, I am going to do some experiments here and then adapt the changes locally, so your pull request might disappear here.

OK.

halcon74 · 2020-09-21T10:32:52Z

Concerning "how to checkout a pull request": On the upper right corner, there is a button called Open with. You can then check out the pull request via gh pr checkout <pull_request_number>. I totally forgot, that GitHub recently implemented a feature to manage GitHub repositories via CLI.

Good to know, about 'gh'!

keks24 · 2020-09-21T10:42:54Z

Here is what I did with your changes:

~~0. Simulating, that I work via GitHub:~~

# this generates a random directory and automatically navigates to it "cd $(mktemp -d)"; see 1.
$ cdt
$ git clone "[email protected]:keks24/dotfiles.git"
$ cd "dotfiles/"

Since I am working with my local Gitea instance, I add a separate origin github:

$ git checkout master
$ git remote add github "[email protected]:keks24/dotfiles.git"
$ git remote -v
github  [email protected]:keks24/dotfiles.git (fetch)
github  [email protected]:keks24/dotfiles.git (push)
origin  [email protected]:keks24/dotfiles.git (fetch)
origin  [email protected]:keks24/dotfiles.git (push)

Check out this pull request and automatically create a new branch, called enhancements_compiling_kernel²:

$ git fetch github pull/1/head:enhancements_compiling_kernel

This avoids to apply the changes to the current branch I am working on, which is currently master.

Apropos branch names: GitHub is about to change the branch name master to main. This anti-racism thing is going around like fire. At many points this is so ridiculous and it will only cause more issues...

Check out the new branch:

$ git branch
enhancements_compiling_kernel
master
$ git checkout enhancements_compiling_kernel

Take a look at the log:

$ git log
# the best cli tool, i found so far, when working with git repositories; see 3 and 4.
$ tig

I see here, that you state what you have changed. I see this in the diff, so this is actually redundant. It would be better to tell why you have changed it. For example:

Rename

Rename Section 1.2 to 1.1

to

correct typo

Associating the commit message correct typo with your change makes the explanation complete. A commit message should always answer the question why and not what.

Edit and pick⁵ some of the commits and apply them:

$ git log --pretty="oneline"
$ git checkout master
# cherry picking from the branch "enhancements_compiling_kernel"
$ git cherry-pick dbdf88b8d3fd68319f9b6afd77b880f67d26187b
[...]
# when there are some conflicts, edit the file with an editor and then
$ git add usr/src/README
$ git cherry-pick --continue

Ah, I see. Cherry picking is also merging at the same time, where you also might have to solve merge conflicts. Now I understand your issues with my pull request. This is actually for advanced users. And this⁷ is how to abort a git cherry-pick.

I cherry picked some of your commits and applied my changes to them.

I also stumbled across this page⁶, which nicely adapts the output of git log.

Push all changes:

$ git push

Remove the origin github:

$ git remote remove github
$ git remote -v
origin  [email protected]:keks24/dotfiles.git (fetch)
origin  [email protected]:keks24/dotfiles.git (push)

¹ https://github.com/grml/grml-etc-core/blob/v0.17.4/etc/zsh/zshrc#L3419
² https://stackoverflow.com/a/30584951
³ https://github.com/jonas/tig
⁴
⁵ https://mattstauffer.com/blog/how-to-merge-only-specific-commits-from-a-pull-request/
⁶ https://ma.ttias.be/pretty-git-log-in-one-line/
⁷ https://stackoverflow.com/a/16826728

halcon74 · 2020-09-21T13:31:27Z

Thanks for sharing your experience! I'll study it.

Mercurial (which I'm used to) branches are designed in somewhat another way. There are multiple heads, which can diverge-converge. (One commit can't be included in different branches)

halcon74 · 2020-09-22T23:02:46Z

Hi Ramon, I noticed also that there is not mentioned cd linux before make (I see no reason to create another PR for it)

keks24 · 2020-09-23T18:53:17Z

Hi Ramon, I noticed also that there is not mentioned cd linux before make (I see no reason to create another PR for it)

Oh yeah, I forgot to add that!

You can still work with your fork and adapt it. The commit message will be shown here.

keks24 · 2020-09-23T21:38:39Z

Done; see #1 (comment).

Thanks for the effort!

halcon74 · 2020-09-23T22:06:45Z

Thanks for the information about cherry-pick (abort, continue) and other details.

About editing the file with an editor: my editor for git wasn't configured properly and wasn't opening (now it is).

You can still work with your fork and adapt it. The commit message will be shown here.

Shown where? I'm going to check it...

keks24 · 2020-09-23T22:18:17Z

About editing the file with an editor: my editor for git wasn't configured properly and wasn't opening (now it is).

I meant this:

halcon74/shell-scripts#1 (comment)

You can edit that with any editor to solve merge conflicts. :)

Shown where? I'm going to check it...

I meant, if you do further editing on your fork and push it to your fork, all commit messages are shown in this pull request like this:

halcon74 · 2020-09-23T22:22:21Z

I added a new commit and pushed it to origin, but I don't see it here...

halcon74@23010b9

Maybe, it's because the PR is closed?

keks24 · 2020-09-24T01:19:52Z

Yes, that could be it. You could test it with your other pull request about g-cpan.

halcon74 · 2020-09-24T01:30:45Z

Possible. If/when I have something to add. Does it work only for master branch?

keks24 · 2020-09-24T09:41:58Z

I never tested it, but I think, it depends on which branch of yours you want to merge. In your case, it is master.

halcon74 added 9 commits September 20, 2020 14:44

Change Section 2 text

e26b70f

Add Section 2.1

cf95b32

Rename Section 1.2 to 1.1

dbdf88b

Change Section 3 text

2213790

Add Sections 3.1 and 3.2

3496fae

Change Section 4.1 text

0577f12

Add Sections 4.1.1 and 4.1.2

b2ff16c

Move Section 9 up (as Section 7)

d3f8b50

Change Section 7 text

4b9b5e8

halcon74 commented Sep 20, 2020

View reviewed changes

usr/src/README Show resolved Hide resolved

keks24 self-assigned this Sep 21, 2020

keks24 closed this Sep 23, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Few changes to the instructions how to compile a new kernel #1

Few changes to the instructions how to compile a new kernel #1

halcon74 commented Sep 20, 2020 •

edited

Loading

halcon74 commented Sep 20, 2020

halcon74 commented Sep 20, 2020

halcon74 commented Sep 20, 2020 •

edited

Loading

keks24 commented Sep 21, 2020 •

edited

Loading

keks24 commented Sep 21, 2020

halcon74 commented Sep 21, 2020 •

edited

Loading

halcon74 commented Sep 21, 2020

keks24 commented Sep 21, 2020 •

edited

Loading

halcon74 commented Sep 21, 2020 •

edited

Loading

halcon74 commented Sep 22, 2020

keks24 commented Sep 23, 2020 •

edited

Loading

keks24 commented Sep 23, 2020 •

edited

Loading

halcon74 commented Sep 23, 2020 •

edited

Loading

keks24 commented Sep 23, 2020 •

edited

Loading

halcon74 commented Sep 23, 2020 •

edited

Loading

keks24 commented Sep 24, 2020

halcon74 commented Sep 24, 2020

keks24 commented Sep 24, 2020

Few changes to the instructions how to compile a new kernel #1

Few changes to the instructions how to compile a new kernel #1

Conversation

halcon74 commented Sep 20, 2020 • edited Loading

halcon74 commented Sep 20, 2020

halcon74 commented Sep 20, 2020

halcon74 commented Sep 20, 2020 • edited Loading

keks24 commented Sep 21, 2020 • edited Loading

keks24 commented Sep 21, 2020

halcon74 commented Sep 21, 2020 • edited Loading

halcon74 commented Sep 21, 2020

keks24 commented Sep 21, 2020 • edited Loading

halcon74 commented Sep 21, 2020 • edited Loading

halcon74 commented Sep 22, 2020

keks24 commented Sep 23, 2020 • edited Loading

keks24 commented Sep 23, 2020 • edited Loading

halcon74 commented Sep 23, 2020 • edited Loading

keks24 commented Sep 23, 2020 • edited Loading

halcon74 commented Sep 23, 2020 • edited Loading

keks24 commented Sep 24, 2020

halcon74 commented Sep 24, 2020

keks24 commented Sep 24, 2020

halcon74 commented Sep 20, 2020 •

edited

Loading

halcon74 commented Sep 20, 2020 •

edited

Loading

keks24 commented Sep 21, 2020 •

edited

Loading

halcon74 commented Sep 21, 2020 •

edited

Loading

keks24 commented Sep 21, 2020 •

edited

Loading

halcon74 commented Sep 21, 2020 •

edited

Loading

keks24 commented Sep 23, 2020 •

edited

Loading

keks24 commented Sep 23, 2020 •

edited

Loading

halcon74 commented Sep 23, 2020 •

edited

Loading

keks24 commented Sep 23, 2020 •

edited

Loading

halcon74 commented Sep 23, 2020 •

edited

Loading