Stupid git question (pull stopped working....)

Hi,

I have been keeping up to date with org.openembedded.dev by doing regular git-pull on my clone of git://git.openembedded.net/org.openembedded.dev/

This morning I received the follow error

OE:beagleboard john.stower@bikini:~/beagle/oe/org.openembedded.dev$ git-pull
You asked me to pull without telling me which branch you
want to merge with, and ‘branch.master.merge’ in
your configuration file does not tell me either. Please
name which branch you want to merge on the command line and
try again (e.g. 'git pull ').
See git-pull(1) for details on the refspec.

What changed, and what should I type for the repository and refspec?

My clone is completely unmodified, my changes are in a local overlay

Sorry about my stupid newbie git question

John

You need to use the 'org.openembedded.dev' branch, not 'master', I
don't know the git commands to do that, but editing stuff in .git
seems to work.

regards,

Koen

Hi,

I have been keeping up to date with org.openembedded.dev by doing regular
git-pull on my clone of git://git.openembedded.net/org.openembedded.dev/

This morning I received the follow error

OE:beagleboard john.stower@bikini:~/beagle/oe/org.openembedded.dev$ git-pull
You asked me to pull without telling me which branch you
want to merge with, and ‘branch.master.merge’ in
your configuration file does not tell me either. Please
name which branch you want to merge on the command line and
try again (e.g. ‘git pull ’).
See git-pull(1) for details on the refspec.

What changed, and what should I type for the repository and refspec?

My clone is completely unmodified, my changes are in a local overlay

Sorry about my stupid newbie git question

You need to use the ‘org.openembedded.dev’ branch, not ‘master’, I
don’t know the git commands to do that, but editing stuff in .git
seems to work.

Based on the patches present in my tree I think i am using the dev branch, but Im so confused as why it worked yesterday and stopped working this morning.

Would you mind sending me the relevant config in .git?

John

Hi,

I have been keeping up to date with org.openembedded.dev by doing regular
git-pull on my clone of git://git.openembedded.net/org.openembedded.dev/

This morning I received the follow error

OE:beagleboard john.stower@bikini:~/beagle/oe/org.openembedded.dev$ git-pull
You asked me to pull without telling me which branch you
want to merge with, and ‘branch.master.merge’ in
your configuration file does not tell me either. Please
name which branch you want to merge on the command line and
try again (e.g. ‘git pull ’).
See git-pull(1) for details on the refspec.

What changed, and what should I type for the repository and refspec?

My clone is completely unmodified, my changes are in a local overlay

Sorry about my stupid newbie git question

You need to use the ‘org.openembedded.dev’ branch, not ‘master’, I
don’t know the git commands to do that, but editing stuff in .git
seems to work.

Based on the patches present in my tree I think i am using the dev branch, but Im so confused as why it worked yesterday and stopped working this morning.

Would you mind sending me the relevant config in .git?

No problem, this (.git/config) got it working

[core]
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true
[remote “origin”]
url = git://git.openembedded.net/org.openembedded.dev/
fetch = +refs/heads/:refs/remotes/origin/
[branch “master”]
remote = origin
merge = refs/heads/org.openembedded.dev