Re: [PATCH 2/3] Rebase to parent branch after git-fetch in "stg pull".

On Fri, Feb 02, 2007 at 09:58:06AM +0000, Catalin Marinas wrote:

On 01/02/07, Yann Dirson [off-list ref] wrote:

quoted

Previously we were just assuming that the remote from which we
just failed defined a local branch whose name was the same as the
remote def, and that this branch was the parent.  While this is true
for the most common case (branch "origin" from remote "origin"), it is
quite an unflexible assumption.

The t1200-push-modified.sh test fails after applying this patch. It
looks like the 3rd test fails to pull the changes from 'foo' into
'bar'.

Strange, it passes here, even after pulling you latest commits
(HEAD=fba895f5f12a652c248b0fd02b7c41f8342cfbdc).

Best regards,
-- 
Yann.