Re: [RFC/PATCH] Fast forward strategies allow, never, and only

From: Sverre Hvammen Johansen <hvammen@gmail.com>
Date: Mar 12, 2008, 04:24 UTC
Message-ID: <402c10cd0803112124i2726c32m75b9353d902df320@mail.gmail.com>
In-Reply-To: <m33aqxzknl.fsf@localhost.localdomain>

On Tue, Mar 11, 2008 at 1:15 AM, Jakub Narebski <jnareb@gmail.com> wrote:

Show 7 quoted lines

>  > +never::
>  > +     Generate a merge commit even if the merge resolved
>  > +     as a fast-forward.
>
>  This is equivalent of current '--no-ff'; nevertheless I think that it
>  would be better to name this strategy 'commit' or 'merge', as in
>  --ff=merge, or --ff=commit.

If there is consensus to change this I will.

Show 9 quoted lines

>  > +only::
>  > +     Only allow a fast-forward.  The merge will fail
>  > +     unless HEAD is up to date or the merge resolved as
>  > +     a fast-forward.
>
>  This is equivalent of '--ff-only' or '--strategy=ff'... Errr...
>  I'm sorry, such option does not exist, and it would be I guess
>  useful addition to default non '+' fetch refspec allowing fast-forward
>  only, and to receive.denyNonFastForwards to control push behavior.

I agree, but it is over my head to implement this now.

-- 
Sverre Hvammen Johansen