[beginner] updating via github

rickatnight11 · 2009-04-27 20:56

Can you start a new terminal session, navigate to the directory, check out the auriga branch, and try to pull the code? Copy all of the terminal to a text file and attach it to a post here. I'd like to see what you are doing and what happens.

ppic · 2009-04-27 20:58

ok i'm on it

Code:

login as: root

root@192.168.0.6's password:

BusyBox v1.1.0 (2009.03.06-16:49+0000) Built-in shell (ash)

Enter 'help' for a list of built-in commands.

DiskStation> cd /volume1/test/xbmc/skin/aeon

DiskStation> git checkout -b auriga origin/auriga

fatal: git checkout: branch auriga already exists

DiskStation> git pull

/opt/libexec/git-core/git-pull: /opt/libexec/git-core/git-pull: 163: tr: not found

You asked me to pull without telling me which branch you

want to merge with, and 'branch.auriga.merge' in

your configuration file does not tell me either.        Please

specify which branch you want to merge on the command line and

try again (e.g. 'git pull <repository> <refspec>').

See git-pull(1) for details.

If you often merge with the same branch, you may want to

configure the following variables in your configuration

file:

    branch.auriga.remote = <nickname>

    branch.auriga.merge = <remote-ref>

    remote.<nickname>.url = <url>

    remote.<nickname>.fetch = <refspec>

See git-config(1) for details.

DiskStation> git pull

dandirk · 2009-04-27 21:09

ok looks like you already have a local auriga branch... I ran into this issue...

This will show you what local branches you have, a * should show infront of the active branch (probably will list master and auriga)

Code:

cd /volume1/test/xbmc/skin/aeon

git branch -r

If auriga is already there you could delete it

Code:

cd /volume1/test/xbmc/skin/aeon

git branch -d auriga

Then run the git branch -b auriga origin/auriga command again to rebuild the local branch and switch to it.

I think I also has some success with

Code:

git pull auriga

ppic · 2009-04-27 21:13

Code:

DiskStation> git branch -r

  origin/HEAD

  origin/auriga

  origin/master

dandirk · 2009-04-27 21:21

doh sorry run just git branch

the -r is for remote branches on the server not local

dandirk · 2009-04-27 21:22

I will be able to check out my machine when I got home... I figured out my guide last night so I wasn't able to test a git pull update...

ppic · 2009-04-27 22:01

Code:

DiskStation> git branch

* auriga

  master

rickatnight11 · 2009-04-27 22:19

Now follow the rest of his directions:

dandirk Wrote:If auriga is already there you could delete it

Code:

cd /volume1/test/xbmc/skin/aeon git branch -d auriga

Then run the git branch -b auriga origin/auriga command again to rebuild the local branch and switch to it.

I think I also has some success with

Code:

git pull auriga

ppic · 2009-04-27 22:26

arg!
error when i tried to delete.

Code:

DiskStation> git branch -d auriga

error: Cannot delete the branch 'auriga' which you are currently on.

and when i try to pull:

Code:

DiskStation> git pull auriga

fatal: 'auriga': unable to chdir or not a git archive

fatal: The remote end hung up unexpectedly

rickatnight11 · 2009-04-27 22:38

Switch over to the master branch with

Code:

git checkout -b master

and then try to remove the auriga branch again.

ppic Skilled Python Coder Posts: 2,663 Joined: Feb 2009 Reputation: 10 Location: France idf	2009-04-27 21:13 Post: #24 Code: `DiskStation> git branch -r origin/HEAD origin/auriga origin/master`
	find quote

dandirk Senior Member Posts: 223 Joined: Oct 2008 Reputation: 1	2009-04-27 21:21 Post: #25 doh sorry run just git branch the -r is for remote branches on the server not local
	find quote

dandirk Senior Member Posts: 223 Joined: Oct 2008 Reputation: 1	2009-04-27 21:22 Post: #26 I will be able to check out my machine when I got home... I figured out my guide last night so I wasn't able to test a git pull update...
	find quote

ppic Skilled Python Coder Posts: 2,663 Joined: Feb 2009 Reputation: 10 Location: France idf	2009-04-27 22:01 Post: #27 Code: `DiskStation> git branch * auriga master`
	find quote

rickatnight11 Senior Member Posts: 138 Joined: Apr 2008 Reputation: 0 Location: Richmond, VA	2009-04-27 22:38 Post: #30 Switch over to the master branch with Code: `git checkout -b master` and then try to remove the auriga branch again. [04/03/2009 04:42:13PM Agent (Prashant_190023): "You are most welcome to the best democratic countries of the world -- India"] --Dell Chat
	find quote