Re: [PATCH] rebase -i: improve error message when picking merge

From: phillip.wood123@gmail.com <phillip.wood123@gmail.com>
Date: Apr 7, 2024, 13:55 UTC
Message-ID: <994b3c35-b5f9-4e0b-b268-4ae19dfc6e15@gmail.com>
In-Reply-To: <7e4eae67-8db9-4be3-8b96-e2e89fa82abf@gmail.com>

Hi Rubén

On 06/04/2024 15:24, Rubén Justo wrote:

Show 22 quoted lines

> On Fri, Apr 05, 2024 at 10:30:37AM +0100, phillip.wood123@gmail.com wrote:
>> On 04/04/2024 20:44, Rubén Justo wrote:
>>> On Mon, Feb 26, 2024 at 10:58:07AM +0000, Phillip Wood via GitGitGadget wrote:
>>> ... I find these repeated messages confusing:
>>>
>> I think that printing the error messages when the todo list is parsed before
>> it is given to the user to edit is helpful as it reminds the user what the
>> problem is. Your test looks confusing because it doesn't really simulate the
>> user editing the todo list.
> 
> Certainly, the test was not clear to express my confusion.
> 
> The ones that are printed _before_ the editor is run are the ones that
> confuse me, because when the user exits the editor we leave those
> lines there:
> 
> 	$ GIT_EDITOR='sed -i s/pick/merge/' ./git rebase --edit
> 	error: 'pick' does not accept merge commits, please use 'merge -C'
> 	error: invalid line 1: pick 17381ab62a
> 
> But maybe it is my interpretation.  Your reasoning of giving it as a
> help to the user makes sense.

Ideally we'd clear the error messages when the user edited the todo list but there isn't an easy way to do that. In principle we could stop printing the error messages when parsing the list before it is edited but I'm not sure how easy that would be. The behavior you are seeing is already present is not changed by this patch - existing error messages behave in the same way.

Best Wishes

Phillip

Show 5 quoted lines

> Thank you for your explanations.
> 
>> Best Wishes
>>
>> Phillip