From: Phillip Wood <phillip.wood123@gmail•com>
To: Junio C Hamano <gitster@pobox•com>,
Cameron Steffen <cam.steffen94@gmail•com>
Cc: git@vger•kernel.org, Phillip Wood <phillip.wood@dunelm•org.uk>,
Johannes Schindelin <Johannes.Schindelin@gmx•de>,
Kristoffer Haugsbakk <code@khaugsbakk•name>
Subject: Re: Show skipped commit message after rebase conflict?
Date: Fri, 25 Jul 2025 15:02:22 +0100 [thread overview]
Message-ID: <184ec60f-9431-43c1-bce3-405bb6b7f959@gmail.com> (raw)
In-Reply-To: <xmqqwm7xxn4a.fsf@gitster.g>
On 24/07/2025 23:03, Junio C Hamano wrote:
> Cameron Steffen <cam.steffen94@gmail•com> writes:
>
>> Sometimes I run into a conflict in a rebase and I end up resolving the
>> conflict by removing all the changes. Then when I run `git rebase
>> --continue`, the current commit is skipped and the rebase continues
>> normally. Would it be possible to emit a message showing that the
>> commit was skipped in this case? It isn't very obvious to me in my
>> workflow that that is what occurred.
>
> I do not know what level of verbosity is needed to grab attention by
> the end user, but something like this might be a good starting
> point?
>
> Totally untested, and there may be implications (like, control
> passes this point in different situations where the messages is not
> warranted).
I haven't tested it but I suspect this prints the warning when
continuing after a "break" command or a failed "exec" command. That is
probably a good place to issue such a message but we'd want to check
whether rebase_path_message() exists before printing the message. I
think we could also read REBASE_HEAD to find out which commit we're
skipping if we wanted to make the message a bit more informative.
It would mean that "rebase --skip" also prints this warning but I think
that is sensible if we're doing it for "rebase --continue" after
removing all the uncommitted changes from the worktree.
Thanks
Phillip
> I'll pick a few people from
>
> git shortlog --since=2.years --no-merges sequencer.c
>
> based on their contribution to the file (not counting the internal
> implementation changes) and Cc them to see if they have ideas.
>
> Thanks.
>
> sequencer.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git c/sequencer.c w/sequencer.c
> index 67e4310edc..677d6105dd 100644
> --- c/sequencer.c
> +++ w/sequencer.c
> @@ -5369,6 +5369,8 @@ static int commit_staged_changes(struct repository *r,
> goto out;
> }
>
> + warning(_("omitting a step that has become empty"));
> +
> if (!final_fixup) {
> ret = 0;
> goto out;
>
next prev parent reply other threads:[~2025-07-25 14:02 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-24 14:43 Show skipped commit message after rebase conflict? Cameron Steffen
2025-07-24 22:03 ` Junio C Hamano
2025-07-25 14:02 ` Phillip Wood [this message]
2025-07-25 14:14 ` Cameron Steffen
2025-07-25 14:40 ` Junio C Hamano
2025-07-25 15:20 ` Cameron Steffen
2025-07-26 0:04 ` Junio C Hamano
2025-07-26 2:40 ` Cameron Steffen
2025-07-26 7:00 ` Johannes Sixt
2025-07-26 15:00 ` Cameron Steffen
2025-07-25 15:24 ` Junio C Hamano
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=184ec60f-9431-43c1-bce3-405bb6b7f959@gmail.com \
--to=phillip.wood123@gmail$(echo .)com \
--cc=Johannes.Schindelin@gmx$(echo .)de \
--cc=cam.steffen94@gmail$(echo .)com \
--cc=code@khaugsbakk$(echo .)name \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=phillip.wood@dunelm$(echo .)org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox