From: Renato Botelho <garga@freebsd.org>
Date: Mon, 22 Mar 2021 13:03:36 GMT
Subject: Re: --no-edit not respected after conflict
Message-ID: <78c7bd2c-c487-756e-c85d-dcfe2866f5f4@FreeBSD.org>
In-Reply-To: <YFUX+Rqdj3gteyql@camp.crustytoothpaste.net>

On 19/03/21 18:30, brian m. carlson wrote:
> On 2021-03-19 at 14:44:30, Renato Botelho wrote:
>> I was reverting multiple commits using --no-edit parameter and after one of
>> those commits conflicted and I resolved using mergetool, no-edit option was
>> not respected anymore and next commits opened editor for me to review commit
>> message.
> 
> I'm not sure I understand what you're seeing here, and I think maybe if
> I knew that I could provide more useful information.  Could you maybe
> provide the set of commands that you're running up to and when you see
> this problem, or even better, a reproduction testcase?
> 

I ran `git revert --no-edit commit1 commit2 ... commitN` and one of 
those reverts had a conflict and the process stopped waiting for a 
resolution.

I ran `git mergetool` and resolved the conflict, then ran `git revert 
--continue` and then it ignored --no-edit parameter for all other 
commits and opened $EDITOR for me to edit commit message.

I managed to reproduce it on a testing repository doing following steps:

% echo a > file
% git init
% git add file
% git commit -m a
% echo b > file; git commit -a -m b
% echo c > file; git commit -a -m c
% echo d > file; git commit -a -m d
% echo e > file; git commit -a -m e
% git log --oneline

d3ec7fc e
23ad2b7 d
2265c82 c
5e0c98a b
b34f81a a

% git revert --no-edit d3ec7fc 2265c82 5e0c98a

It will revert d3ec7fc without any interaction, as expected, then will 
stop the process on 2265c82 due to conflict and after resolve conflict 
when I do:

% git revert --continue

--no-edit parameter will be ignored when reverting 5e0c98a.

-- 
Renato Botelho