Re: pull/push inconsistencies

From: Jakub Narebski <jnareb@gmail.com>
Date: May 15, 2007, 23:21 UTC
Message-ID: <f2df9a$so6$1@sea.gmane.org>
In-Reply-To: <46a038f90705151553h553ae9d3kc3d43af72f385a42@mail.gmail.com>

Martin Langhoff wrote:

Show 10 quoted lines

> When tracking several branches from a repo, git-pull does a fetch (of
> all the remote heads) and merges _only the tracking branch currently
> checked out_. That's ok. However, if I checkout another tracking
> branch and issue git-pull, the merge does not happen because git-fetch
> finds nothing new on the remote side. git-pull should merge anyway if
> remotes/origin/<trackinghead> is ahead of the local head.
> 
> The workaround is to call git-merge explicitly, but git-pull is
> misleading the user saying "nothing to merge" instead of completing
> the merge.

Strange. This would be regression, but in my experience "git pull" _always_ merges, even if there is nothing to fetch. But I don't have branch to merge configured...

-- 
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git