From: Yann Dirson <ydirson@altern.org>
Date: Sun, 07 Oct 2007 14:17:44 GMT
Subject: Re: [StGIT PATCH] Better diagnostic for wrong branch configuration.
Message-ID: <20071007141744.GY26436@nan92-1-81-57-214-146.fbx.proxad.net>
In-Reply-To: <20071007131417.GA28492@diana.vm.bytemark.co.uk>

On Sun, Oct 07, 2007 at 03:14:17PM +0200, Karl Hasselström wrote:
> On 2007-10-05 22:44:52 +0200, Yann Dirson wrote:
> 
> > If the branch.*.merge parameter does not name a valid remote head,
> > stgit would not rebase after a fetch, and would write instead
> > 'Rebasing to "None" ... done'.
> >
> > This patch makes this situation an error and tells the user what to
> > fix in his repo configuration.
> 
> Good. Sign-off?

Oops, sorry - "Signed-off-by: Yann Dirson <ydirson@altern.org>"

> > -                raise GitException, "StGit does not support multiple FETCH_HEAD"
> > +                raise GitException, 'StGit does not support multiple FETCH_HEAD'
> 
> Unrelated quote fixup. No big deal, though.

Right - did not seem to warrant a patch of its own :)

Best regards,
-- 
Yann