Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ggpull tweak to update the current branch's remote tracking branch #582

Closed
wants to merge 1 commit into from
Closed

ggpull tweak to update the current branch's remote tracking branch #582

wants to merge 1 commit into from

Conversation

mreishus
Copy link

@mreishus mreishus commented Sep 1, 2011

I noticed if I used ggpull on my branch 'dev', my remote tracking branch 'origin/dev' was not getting updated, even though my 'dev' branch was. Here's a symptom of the problem shown by example. I'll update my dev branch pulling down 5 commits, then switch away and back to my branch.

mreishus on mreishus-VirtualBox in /tmp/sp2 (58m|dev)
± ggpull
remote: Counting objects: 17, done.
remote: Compressing objects: 100% (4/4), done.
remote: Total 9 (delta 7), reused 7 (delta 5)
Unpacking objects: 100% (9/9), done.
From github.com:foo/bar
 * branch            dev        -> FETCH_HEAD
Updating 123456..abcdef
Fast-forward
 foo/bar/baz |    8      
 1 file changed, 8 insertions( ), 0 deletions(-)

mreishus on mreishus-VirtualBox in /tmp/sp2 (1m|dev)
± git checkout master
Switched to branch 'master'

mreishus on mreishus-VirtualBox in /tmp/sp2 (58m|master)
± git checkout dev
Switched to branch 'dev'
Your branch is ahead of 'origin/dev' by 5 commits.   <------- This message

Now I'm actually in sync with my github dev branch, but git is telling me that I'm ahead of origin/dev by 5 commits. This would make me think that I had 5 commits I hadn't pushed out to github, but this isn't true - it's rather that ggpull updated my "dev" branch but didn't update my remote tracking branch "origin/dev".

My fix is to use git fetch to update the remote tracking branch in addition to the pull.

@zeroasterisk
Copy link

Nice - thanks for the fix... implemented locally

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants