From: Bill Lear <rael@zopyra.com>
Date: Thu, 05 Apr 2007 20:55:18 GMT
Subject: Re: How can git pull be up-to-date and git push fail?
Message-ID: <17941.25142.88657.766384@lisa.zopyra.com>
In-Reply-To: <20070405204604.GA24779@coredump.intra.peff.net>

On Thursday, April 5, 2007 at 16:46:04 (-0400) Jeff King writes:
>On Thu, Apr 05, 2007 at 09:07:11AM -0500, Bill Lear wrote:
>
>> Here is the local:
>> 
>> [core]
>>         repositoryformatversion = 0
>>         filemode = true
>>         bare = false
>>         logallrefupdates = true
>> [remote "origin"]
>>         url = ssh://poire/home/jml/repos/new/fusion
>>         fetch = +refs/heads/*:refs/remotes/origin/*
>> [branch "master"]
>>         remote = origin
>>         merge = refs/heads/master
>
>I don't see anything there that should cause branches under refs/remotes
>to be pushed. Was he using 'git-push --all' by any chance?

No, just plain ol' git push.  One possibility is that in mediating
between him and the list, there has been a loss of information.
Perhaps he omitted details in his account of how things progressed ---
who knows, perhaps he was on the wrong branch (though I doubt this, he
only works on the master branch, and the other branch in question was
someone else's entirely).

Regardless, does my assumption --- a 'git pull' should rectify
the 'you are not up to date' problem --- hold in general?

Thanks for helping.


Bill