On Tue, Dec 13, 2022 at 3:07 AM Gerald Pfeifer gerald@pfeifer.com wrote:
These days I find myself spending more time wrestling with Git/Gitlab than it takes me to create and test a patch.
So I am keenly interested to help improve https://wiki.winehq.org/Git_Wine_Tutorial#Creating_a_fork_on_Gitlab :-)
Here is the first item: I ran
# git clone git@gitlab.winehq.org:gerald/wine.git # git remote add upstream https://gitlab.winehq.org/wine/wine.git
followed by
# git pull --rebase upstream
following https://wiki.winehq.org/Git_Wine_Tutorial#Creating_a_fork_on_Gitlab
And there is where the instructions fail as follows:
# git pull --rebase upstream From https://gitlab.winehq.org/wine/wine
- [new branch] master -> upstream/master
- [new branch] oldstable -> upstream/oldstable
- [new branch] stable -> upstream/stable
You asked to pull from the remote 'upstream', but did not specify a branch. Because this is not the default configured remote for your current branch, you must specify a branch on the command line.
It appears the invocation should be shown as
# git pull --rebase upstream master
instead?
Yes, that looks like a mistake.
PS: I'd volunteer to update the Wiki accordingly if confirmed, alas my wiki.winehq.org account (GeraldPfeifer) does not appear to exist any longer? And creating a new one is not possible?
We could certainly use more wiki editors. Last I checked, Rosanne was the one to ask about account creation. Rosanne, could you please create a wiki account for Gerald?
-Alex