XBMC official Git repository on GitHub (Team-XBMC's primary/head repo on github.com) - Printable Version +- Kodi Community Forum (https://forum.kodi.tv) +-- Forum: Development (https://forum.kodi.tv/forumdisplay.php?fid=32) +--- Forum: Kodi Application (https://forum.kodi.tv/forumdisplay.php?fid=93) +--- Thread: XBMC official Git repository on GitHub (Team-XBMC's primary/head repo on github.com) (/showthread.php?tid=84460) |
- jhsrennie - 2011-01-07 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://[email protected]/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 - spiff - 2011-01-07 1) you, as a dev, need to clone with [email]git@github:xbmc/xbmc.git[/email] (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. - WiSo - 2011-01-07 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). - Montellese - 2011-01-07 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.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. - FireMan - 2011-01-07 I don't get it... Tried 3 times, and aways download 1.1gb and return me a error: Code: xbmc@ASRock-QJM:~/git$ git clone -v https://github.com/xbmc/xbmc.git I also tried with '-o Dharma', and also downloaded 1.1gb and returned the same error. Cheers. - Clumsy - 2011-01-07 @FireMan: tried not using the https repo and just follow the wiki ? Shouldn't be 1,2GB, not sure what is going on. http://wiki.xbmc.org/index.php?title=Git_Usage - CrashX - 2011-03-21 Please add this to wiki, to clear unversioned files: git clean -xvf RE: XBMC official Git repository on GitHub (Team-XBMC's primary/head repo on github.com) - ray1112 - 2012-09-13 Can anybody give me the right commands for compiling night build (Alpha6)? I use (I found this from this forum+wiki): make distclean git clean -xfd git pull (I made "git config branch.master.rebase true" before) ./bootstrap ./configure make -j4 make -C lib/addons/script.module.pil sudo make install But after "git pull" I always have: Cannot pull with rebase: You have unstaged changes. Please commit or stash them. and I always need use "git checkout ." before repeat "git pull". What's wrong? P.S. git status: # On branch master # Changes not staged for commit: # (use "git add/rm <file>..." to update what will be committed) # (use "git checkout -- <file>..." to discard changes in working directory) # # deleted: lib/ffmpeg/version.h # no changes added to commit (use "git add" and/or "git commit -a") RE: XBMC official Git repository on GitHub (Team-XBMC's primary/head repo on github.com) - Martijn - 2012-09-13 if you do "git clean" you will drop any changes you made and you can do "git pull" again RE: XBMC official Git repository on GitHub (Team-XBMC's primary/head repo on github.com) - ray1112 - 2012-09-13 (2012-09-13, 20:17)Martijn Wrote: if you do "git clean" you will drop any changes you made and you can do "git pull" againI didn't make any changes. I only run update & compile night build for testing: ------------------- make distclean git clean -xfd git pull (I made "git config branch.master.rebase true" before) ./bootstrap ./configure make -j4 make -C lib/addons/script.module.pil sudo make install -------------------- I think "make distclean" or "git clean -xfd" delete "lib/ffmpeg/version.h". Edit: What commands do you use for making night build. RE: XBMC official Git repository on GitHub (Team-XBMC's primary/head repo on github.com) - Memphiz - 2012-09-14 docs/readme.yourplatform RE: XBMC official Git repository on GitHub (Team-XBMC's primary/head repo on github.com) - ray1112 - 2012-09-16 (2012-09-14, 17:13)Memphiz Wrote: docs/readme.yourplatformREADME.ubuntu & README.linux say only about compile part (./bootstrap; ... ; sudo make install), nothing about how update source files. Do I need "make distclean" and "git clean -xfd" before "git pull"? RE: XBMC official Git repository on GitHub (Team-XBMC's primary/head repo on github.com) - Memphiz - 2012-09-16 try git fetch origin git reset --hard origin/master normally a pull would be enough - no clue whats wrong on your rig. RE: XBMC official Git repository on GitHub (Team-XBMC's primary/head repo on github.com) - ray1112 - 2012-09-16 Thank you Memphiz. May be I'm too complicated question. I will use only "git pull". RE: XBMC official Git repository on GitHub (Team-XBMC's primary/head repo on github.com) - giftie - 2012-09-17 You best try the following: sudo git clean -xfd && git reset --hard It has always worked for me... |