Thread (43 messages) flat view 43 messages, 4 authors, 2d ago

Re: [PATCH v3 1/5] commit: clarify FROM_REBASE_PICK and is_from_rebase() names

From: Elijah Newren <hidden>
Date: 2026-08-28 17:27:51

On Fri, Aug 28, 2026 at 8:41 AM Junio C Hamano [off-list ref] wrote:
"Elijah Newren via GitGitGadget" [off-list ref] writes:
quoted
From: Elijah Newren <redacted>

Commit 430b75f7209c (commit: give correct advice for empty commit during
a rebase, 2019-12-06) introduced a FROM_REBASE_PICK enum value and an
is_from_rebase() function.  Those names failed to convey that they were
specifically about hitting a commit that becomes empty when rebasing.
Clarify their names now.
Becomes empty is different from picking an empty commit, right.  I
am not sure if "is_from_rebase_empty()" conveys the difference and
more importantly, I am afraid it hints the latter.  I have a feeling
that EMPTY_REBASE (instead of REBASE_EMPTY) may match what we want
to express slightly better, but not by a large margin to make a
difference.  Perhaps Phillip has a better idea?
or maybe FROM_REBASE_NOW_EMPTY and is_from_rebase_now_empty() ?
quoted
While at it, change `whence == FROM_REBASE_EMPTY` to use
`is_from_rebase_empty(whence)`.
Very much appreciated.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help