Re: git rebase fast-forward fails with abbreviateCommands

From: Alban Gruin <alban.gruin@gmail.com>
Date: Mar 28, 2020, 12:21 UTC
Message-ID: <4aeffccc-3a62-b92c-f6f5-0438995f676b@gmail.com>
In-Reply-To: <CABPp-BEV0NxMLuM3U8fqECkEB_XHTvLMav1q_TiYveBWrpsr_w@mail.gmail.com>

Hi Elijah,

Le 27/03/2020 à 19:39, Elijah Newren a écrit :

Show 13 quoted lines

>> A third approach would be to change the meaning of an empty buffer, but
>> this would break some tests (at least t3404.3) and cause more confusion
>> for users than necessary.
> 
> Well, "error: nothing to do" probably makes sense if the user
> specifies a list of empty commands or sees a list of empty commands
> and agrees to pass these to the backend.  But I'm not sure that
> message makes sense for implicitly interactive runs as opposed to
> explicitly interactive ones.  Perhaps we could change the message to
> just be "Already up to date" if the buffer is empty and the run is not
> explicitly interactive?
> 
>

Is this even supposed to happen in non-interactive mode? When I try to rebase an already up-to-date branch, rebase fails with the message "Current branch … is up to date."

> Elijah
>

Cheers, Alban