From: Renato Botelho <garga@FreeBSD.org>
To: "brian m. carlson" <sandals@crustytoothpaste.net>, git@vger.kernel.org
Subject: Re: --no-edit not respected after conflict
Date: Mon, 22 Mar 2021 10:03:36 -0300 [thread overview]
Message-ID: <78c7bd2c-c487-756e-c85d-dcfe2866f5f4@FreeBSD.org> (raw)
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
next prev parent reply other threads:[~2021-03-22 13:06 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-19 14:44 --no-edit not respected after conflict Renato Botelho
2021-03-19 21:30 ` brian m. carlson
2021-03-22 13:03 ` Renato Botelho [this message]
2021-03-22 17:14 ` Elijah Newren
2021-03-24 0:59 ` Elijah Newren
2021-03-24 1:27 ` Junio C Hamano
2021-03-26 7:19 ` Elijah Newren
2021-03-26 15:36 ` Renato Botelho
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=78c7bd2c-c487-756e-c85d-dcfe2866f5f4@FreeBSD.org \
--to=garga@freebsd.org \
--cc=git@vger.kernel.org \
--cc=sandals@crustytoothpaste.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).