git documentation worry

[Alex Holcombe]

Sorry for another newbie developer question, but in updating my
repository to 1.65 I had a problem with the instructions regarding
"Fetching the latest version" at http://www.psychopy.org/developers/repository.html

It is written there that one should issue the following commands:

$ git checkout master
$ git pull upstream master # here 'master' is the desired branch of
psychopy to fetch

When I executed the first command above, it returned:
"Already on 'master'"

When I executed the second command above, it returned:
"fatal: 'upstream' does not appear to be a git repository"

I eventually ended up trying the following:
"git pull git://github.com/psychopy/psychopy.git master"
which worked, as I now have 1.65!

Should the documentation saying "git pull upstream master" be amended,
or did I do something wrong/weird?

I'm still gitting my head 'round git, so any pointers appreciated :)
Alex

[Jeremy Gray]

Sorry for another newbie developer question, but in updating my
repository to 1.65 I had a problem with the instructions regarding
"Fetching the latest version" at http://www.psychopy.org/developers/repository.html

It is written there that one should issue the following commands:

$ git checkout master
$ git pull upstream master  # here 'master' is the desired branch of
psychopy to fetch

When I executed the first command above, it returned:
"Already on 'master'"

that's fine, just informative not an error. the command means "switch to my local branch named master", and it says, dude, you're there.
 

When I executed the second command above, it returned:
"fatal: 'upstream' does not appear to be a git repository"

<snip>

Should the documentation saying "git pull upstream master" be amended,
or did I do something wrong/weird?

I suspect that you need to do the step:

git remote add upstream git://github.com/psychopy/psychopy.git

and then "git pull upstream master" will work (does for me). you might need to do this from within the directory on your local machine that contains psychopy (your local clone of your fork on github), but then again you might not, I don't really know, being a git newbie

--Jeremy

[Alex Holcombe]

Thanks Jeremy, you're right, that worked.
I had already issued that "add upstream" command earlier, but it must
have gotten messed up when I reinstalled or did something else.

Alex