git-pull doesn't update my refs for remotes/origin/master

Hi,

Any idea why this happens? When I do a 'git pull origin master' while in the master branch, it fetches all the latest commits, but doesn't update the 'remotes/origin/master' reference. When I do a 'gitk', the remotes/origin/master reference is still pointing to the old original HEAD commit. Only when I do a 'git push origin master', does it update the remotes/origin/master references?

I'm using git version 1.7.0.4 as is include with Ubuntu 10.04

Here is my .git/config file:

----8<-------------8<-------------8<-------------8<-------------8<----
[core]
	repositoryformatversion = 0
	filemode = true
	bare = false
	logallrefupdates = true
	safecrlf = true
[remote "origin"]
	url = ssh://graemeg@fpgui.git.sourceforge.net/gitroot/fpgui/fpgui
	fetch = +refs/heads/*:refs/remotes/origin/*
[branch "master"]
	remote = origin
	merge = refs/heads/master
[gui]
	geometry = 1182x686+1573+97 387 428
	wmstate = normal
[push]
	default = current
[remote "usb"]
	url = /media/flash16gig/git_repos/fpgui.git
	fetch = +refs/heads/*:refs/remotes/usb/*
[branch "v0.4_fixes"]
	remote = origin
	merge = refs/heads/v0.4_fixes
[remote "github"]
	url = git@github.com:graemeg/fpGUI.git
	fetch = +refs/heads/*:refs/remotes/github/*
----8<-------------8<-------------8<-------------8<-------------8<----

Regards,
  - Graeme -

Graeme Geldenhuys venit, vidit, dixit 25.07.2011 09:58:

...

Here's my quote from git-pull's man page:

A parameter <ref> without a colon is equivalent to <ref>: when
pulling/fetching, so it merges <ref> into the current branch without
               storing the remote branch anywhere locally

I.e., just do "git pull origin".

Michael

On 07/25/2011 10:35 AM, Michael J Gruber wrote:

Clearly I need to read the help with more attention. :)

OK, so I was trying to be too helpful. Git is clever enough, so using a simplified command line is better in this case. Many thanks for the quick reply.

Regards,
  - Graeme -