XBMC official Git repository on GitHub (Team-XBMC's primary/head repo on github.com)

git branch?

darkscout Wrote:git branch?

As far as I understand a "fork" on GitHub is not the same as a branch but I'm not 100% sure about the details and the differences.

Maybe dushmaniac can input some advice on this.

He 'created' a Dharma git and applied pvr branch patches on it and then he did it again a few days ago because of the main XBMC git cleanup/reborn/spawn.

It should be fairly easy, after one knows how it's done.

I'm still learning git pull/push/rebase...

hudo

you'll have to rename your previous fork first to anything other than "xbmc". then you'll have to create a new fork.

move or delete your earlier checked out sources and git clone your newly created fork.
if you had patches earlier, apply them again (hint: git format-patch & git am).

push it to your repo (origin/master) and your done.

Unable to clone xbmc from github. This was after 1,2gb of download:

Is this the correct way to do it? I use TortoiseGIT but it helpfully shows the command it's using:

1. git.exe clone --progress -v "https://jhsrennie@github.com/xbmc/xbmc.git" "D:\Dev\GIT\xbmc" to create a local copy of the repo. jhsrennie is my github username.

2. Make my changes

3. git commit to commit my changes to my local copy of the repo

4. git.exe push --progress "origin" master:master to push my changes up to the XBMC repository

Step 4 fails at the moment so am I doing this the correct way, and if so do I need to ask a member of the dev team to grant me push access?

http://wiki.xbmc.org/index.php?title=Git_Usage has blood curdling threats about "Never EVER force a push (non-fast-forward commit) to mainline". Can this be clarified for us git newbies? Is the problem overwriting code already pushed in by another dev? If so do you need to update your local archive then try again?

Finally the Git Usage article tells Linux/OSX users to update using git pull --rebase but doesn't mention Windows. Does this apply to Windows as well?

JR

1) you, as a dev, need to clone with git@github:xbmc/xbmc.git (ssh). this is required for push access. see github for how to upload your ssh key.

git pull --rebase (and anything else mentioned) applies to windows as well, it's just harder to explain in those gui's (i for one never tried tortoisegit)

also see the int forums.

I'll try to find some time to extend the wiki article for us windows users (split it like the FAQ). As I'm with git a noob too I can only cover the basics.
@jhsrennie: Make sure TheUni added your account on github (see the thread in our priv forum). The https url is fine for pushing too you just have to provide the password. The url spiff mentioned can be used if you work with ssh keys (which I have on my server but not for github atm).

dushmaniac Wrote:you'll have to rename your previous fork first to anything other than "xbmc". then you'll have to create a new fork.

move or delete your earlier checked out sources and git clone your newly created fork.
if you had patches earlier, apply them again (hint: git format-patch & git am).

push it to your repo (origin/master) and your done.

Thanks for the rename hint. Why didn't I think off that? Working on getting all the right patches into my new fork now. Thanks again for the explanation.

FireMan Wrote:Unable to clone xbmc from github. This was after 1,2gb of download:

Why did you have to download 1.2 GB? I just forked and cloned and only had to download about 270 MB. Btw nice cleanup of the repository

spiff Wrote:git pull --rebase (and anything else mentioned) applies to windows as well, it's just harder to explain in those gui's (i for one never tried tortoisegit)

I tried TortoiseGit but I don't like it (compared to TortoiseSVN). I installed the "Git Bash" from msysgit and do everything from command line which is much better.

I don't get it... Tried 3 times, and aways download 1.1gb and return me a error:


I also tried with '-o Dharma', and also downloaded 1.1gb and returned the same error.

Cheers.