Topic: Move Widelands to GitHub

Thanks for your explanations Nordfriese

GunChleoc wrote:

You clone only once. The command for checking out a branch is git checkout .... You can also create a shallow clone with will only grab the latest commit - it's documented in Gitprimer somewhere.

Hm, not very helpful comment... sorry. I have looked into the wiki article and found a possible table row in Comparison with bazzar, but i am not sure about the 'branch name'. I guess its 'update-script' but trying

git checkout -b update-script

or

git checkout -b update-script https://github.com/gunchleoc/widelands.git

produces only errors.

Top

Quote

kaputtnik wrote:

Thanks for your explanations Nordfriese

You´re welcome

GunChleoc wrote:

You clone only once. The command for checking out a branch is git checkout .... You can also create a shallow clone with will only grab the latest commit - it's documented in Gitprimer somewhere.

Hm, not very helpful comment... sorry. I have looked into the wiki article and found a possible table row in Comparison with bazzar, but i am not sure about the 'branch name'. I guess its 'update-script' but trying

git checkout -b update-script

or

git checkout -b update-script https://github.com/gunchleoc/widelands.git

produces only errors.

Can´t try this out myself because my development machine is having network problems, but you could try git fetch https://github.com/gunchleoc/widelands.git update-script. If that also doesn´t work, you might have to (time-intensively) clone the whole fork (git clone https://github.com/gunchleoc/widelands.git; cd widelands; checkout update-script)

Top

Quote

Hessenfarmer, please don't give up that easily

Since you're on Windows, I recommend that you install Tortoise Git https://tortoisegit.org/. This is a lot easier to learn than using the command line, and then I can help you from there. The reason that we only have instructions for the command line so far is that there are so many different Git GUI clients.

Kaputtnik, try this:

$ git clone https://github.com/widelands/widelands.git --depth 1
$ cd widelands/
$ git remote add gunchleoc https://github.com/gunchleoc/widelands.git
$ git fetch gunchleoc --depth 1
$ git checkout update-script 

The last message you see should be:

Branch 'update-script' set up to track remote branch 'update-script' from 'gunchleoc'.
Switched to a new branch 'update-script'

And this is what the commands mean:

$ git clone https://github.com/widelands/widelands.git --depth 1
$ cd widelands/

Clone the main Widelands repository and change into its directory. You only need to do this if you haven't already. --depth 1 means you only fetch the latest revision, which will speed things up.

$ git remote add gunchleoc https://github.com/gunchleoc/widelands.git

Register my fork and call it "gunchleoc"

$ git fetch gunchleoc --depth 1

Register what's in my fork. Again, --depth 1 will speed things up. Git should tell you about the branches that it has found at this point.

$ git checkout update-script 

Switch to the branch.

Busy indexing nil values

Top

Quote

Gun: working with remotes like you explained above is the way to go.

git remote add gunchleoc https://github.com/gunchleoc/widelands.git is the way to go so we do not have to clone the main repo more then once.

Then we should use git worktree to create local source / working directories.

The basic Atomic-Object for git is a commit-set (indendified by its hash). It is possible to have an inifinite number of repostiories and move around commit-sets between them.

Linux (some git named Linus actually invented it ) uses a hierarchical aproach: subsystem maintainers collect change-sets an commit them to a master. From there the version branches are forked. Version maintainers cherry pick (security-)changes into the stable branches. We are not as big as the Linux Kernel but we could go a similar way.

The only thing I must check now If I can commit to someone elses personal repo/branch I will try this now with gunchleocs update-script.

ssh works interchangeable with http checkout I will add this to the Primer

Here are the widelands where people may dwell, walking around care that evrythings well.

Top

Quote

Thanks GunChleoc, that worked. Now i have one directory in which i change the branches with git checkout. This seems to me the main difference to bazaar, where you have each branch in its own directory, whereas with git you have only ONE directory (except the workflow described by Nordfriese). Is this true?

The thing with linking other documentation is fine, but i think we should at least provide a full working example. If a new developer want to propose a change of one line in a lua file and he has no experience with git, he won't do that (propose the line change) if he has to read a lot of documentation on different sites, imho.

Top

Quote