Fork is a github/gitlab term for cloning a github/gitlab repository inside the github/gitlab ecosystem, usually in a web browser.
Iâm not a git guru neither. I forked the project I wanted to patch on http://source.puri.sm/ by pressing the ËforkË button.
After that from the command line on my system I
- cloned my fork of the repository
- created a new branch to work on
- commited and pushed that branch
and then had the option to create a merge request to the original repository through the web interface. I never bothered to replace the steps I took through the web interface by cli.
You are right about the need to re-encrypt but I have my doubts that that would be a reason not to document the LUKS variant. Users can still manually do the re-encryption as part of the totality of the flashing process. Also, I believe that a fix for that is basically in flight i.e. has been done by Purism but may not be present if you downloaded right now.
If I look with FF into the project as https://source.puri.sm/Librem5/developer.puri.sm/-/tree/master
and Iâm signed in, where is that âforkâ button located?
On the repos main page look to the upper right corner. There you should find the fork icon:
If your browser window is quiet narrow you could find it below the title âdeveloper.puri.smâ.
Sorry to go off topic, but when I read the title of this thread, I had a mental image of someone lashing their phone again and again with a whip because it wouldnât encrypt their data.
I had to giggle.
1 Like
What I have now done so far after creating the fork with the browser which gave https://source.puri.sm/Guru/developer.puri.sm:
git clone git@source.puri.sm:Guru/developer.puri.sm.git
cd developer.puri.sm/
git branch --list
* master
git branch doc-fix
git branch --list
doc-fix
* master
git checkout doc-fix
vim Development_Environment/Phone/Troubleshooting/Reflashing_the_Phone.rst
git add Development_Environment/Phone/Troubleshooting/Reflashing_the_Phone.rst
git commit -m 'added --variant luks to flash command'
[doc-fix 9b202b4] added --variant luks to flash command
1 file changed, 2 insertions(+), 2 deletions(-)
...
git log
commit 9b202b4c44f696c074ccec6f9e8d812e5eab6af1 (HEAD -> doc-fix)
Author: Matthias Apitz <apitzm@oclc.org>
Date: Thu Apr 13 08:50:48 2023 +0200
added --variant luks to flash command
What is now the correct command for the push? I tested with --dry-run:
git push --dry-run --set-upstream origin doc-fix
To source.puri.sm:Guru/developer.puri.sm.git
* [new branch] doc-fix -> doc-fix
Would set upstream of 'doc-fix' to 'doc-fix' of 'origin'
Is this push correct or something stupid for which I will be blamed later? 
Just try it - itâs your fork, your repository. If youâll break it you can start over. (Well, maybe itâd be a good idea to keep a backup of the changes you made just in case youâll break your local repository at some point.)
I did so and it created a Merge Request at the server, but a MR against my fork and not against the official master and perhaps nobody will see it and merge it. 
If youâve come that far, youâll find the way to mr against the original repo. I remember a drop-down list somewhere to select the âtargetâ for the mr, but that is just from memoryâŚ
Correct. (I have successfully gone through this process with the documentation on one occasion i.e. my merge request did eventually happen.)
I chose to communicate with Purism staff in order to get someone to see it and merge it.
Someone saw the MR and started a discussion in the MR itself:
https://source.puri.sm/Guru/developer.puri.sm/-/merge_requests/1#note_236044
(perhaps you need to sign in to see it).
1 Like
I believe so - but I have an account (by implication of my earlier post) so ⌠no problem.