From: Junio C Hamano <gitster@pobox.com>
To: Johannes Altmanninger <aclopte@gmail.com>
Cc: Erik Cervin Edin <erik@cervined.in>, git@vger.kernel.org
Subject: Re: [PATCH] sequencer: avoid dropping fixup commit that targets self via commit-ish
Date: Mon, 19 Sep 2022 09:23:44 -0700 [thread overview]
Message-ID: <xmqqleqfcoz3.fsf@gitster.g> (raw)
In-Reply-To: <xmqqh714dv7n.fsf@gitster.g> (Junio C. Hamano's message of "Sun, 18 Sep 2022 18:11:24 -0700")
Junio C Hamano <gitster@pobox.com> writes:
> Your solution looks somewhat surprising to me, as I would naively
> have thought to fix the use of _by_name() and limit its use only
> when the input token is all hexadecimal, or something. I'd need to
> think more to convince myself why this is the right solution.
OK, we try to find what to amend with the current "fixupish" from
the todo slab, which by definition must be something that we have
already dealt with. The current "fixupish" should not be found
because we haven't finished dealing with it, so delaying the
addition of the current one to the todo slab is a must.
There is no leaving or continuing the loop, other than an error
return that aborts the whole thing, that may break the resulting
todo slab in the normal case due to this change, either.
The fix makes sense to me. Will queue.
Thanks.
next prev parent reply other threads:[~2022-09-19 16:23 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-17 14:45 [BUG] fixup commit is dropped during rebase if subject = branch name Erik Cervin Edin
2022-09-17 18:04 ` Junio C Hamano
2022-09-18 14:55 ` Erik Cervin Edin
2022-09-17 23:19 ` Johannes Altmanninger
2022-09-18 12:10 ` [PATCH] sequencer: avoid dropping fixup commit that targets self via commit-ish Johannes Altmanninger
2022-09-18 15:05 ` Erik Cervin Edin
2022-09-18 17:54 ` Johannes Altmanninger
2022-09-19 1:11 ` Junio C Hamano
2022-09-19 16:07 ` Junio C Hamano
2022-09-20 3:20 ` Johannes Altmanninger
2022-09-19 16:23 ` Junio C Hamano [this message]
2022-09-20 3:11 ` [PATCH v2] " Johannes Altmanninger
2022-09-20 8:26 ` Phillip Wood
2022-09-21 18:47 ` Junio C Hamano
2022-09-22 4:00 ` Johannes Altmanninger
2022-09-22 19:32 ` Junio C Hamano
2022-09-24 22:29 ` [PATCH v3] " Johannes Altmanninger
2022-09-19 23:09 ` [PATCH] " Junio C Hamano
2022-09-20 3:27 ` Johannes Altmanninger
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=xmqqleqfcoz3.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=aclopte@gmail.com \
--cc=erik@cervined.in \
--cc=git@vger.kernel.org \
/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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.