Re: [PATCH] sequencer: refuse to revert shallow boundary commits by default

From: Nakul V S <vsnakul@gmail.com>
Date: Oct 31, 2026, 17:29 UTC
Message-ID: <20261031172900.69612-1-vsnakul@gmail.com>
In-Reply-To: <xmqqqzhina26.fsf@gitster.g>

Hi Junio,

Thanks for the review, and for the question.

Show 5 quoted lines

> The next natural question is where the modification should go if we
> want to make sure we protect these shallow boundaries not just from
> revert but also from "cherry-pick", "rebase", and possibly "commit
> --amend".  Is sequencer.c:do_pick_commit() the right place to cover
> all of them?

No, it isn't. When I wrote v1 I was only thinking about "revert", since that is what the original thread was about. do_pick_commit() is where every pick and revert ends up, so it looked like the easiest place for a single check. I honestly didn't think about cherry-pick or rebase at that point, or about how late that is for the user.

v2 moves it. The check now happens where each command builds its list of commits, and they all share one helper. "rebase --apply" doesn't go through the sequencer, so it gets a small check of its own before HEAD is touched.

I've left "git commit --amend" alone for now. It is a different code path, so I'd rather do it as a separate patch than make this one bigger. Let me know if you'd prefer it in the same series.

v2 is here: https://lore.kernel.org/git/pull.2273.v2.git.1793455522168.gitgitgadget@gmail.com

Thanks, Nakul