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

From: Catalin Marinas <catalin.marinas@gmail.com>
Date: Feb 2, 2007, 09:58 UTC
Message-ID: <b0943d9e0702020158o1a07b8efu9302794c57d050e1@mail.gmail.com>
In-Reply-To: <20070201234805.3313.20525.stgit@gandelf.nowhere.earth>

On 01/02/07, Yann Dirson <ydirson@altern.org> wrote:

Show 5 quoted lines

> 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'.

Thanks.

-- 
Catalin