Thread (1 message) 1 message, 1 author, 2021-08-30

Re: [PATCH v3] sequencer: advise if skipping cherry-picked commit

From: Junio C Hamano <hidden>
Date: 2021-08-30 23:40:13

Junio C Hamano [off-list ref] writes:
Josh Steadmon [off-list ref] writes:
quoted
Silently skipping commits when rebasing with --no-reapply-cherry-picks
(currently the default behavior) can cause user confusion. Issue
warnings when this happens, as well as advice on how to preserve the
skipped commits.

These warnings and advice are displayed only when using the (default)
"merge" rebase backend.

Update the git-rebase docs to mention the warnings and advice.

Signed-off-by: Josh Steadmon <redacted>
---
Looks sensible.

Will queue.  Let's merge it down to 'next' in a few days and leave
the follow-on work to later.
... except for that the advice_skipped_cherry_picks variable should
either be file-scope static or declared in advice.h; otherwise "make
sparse" would fail.

It only matters until ab/retire-advice-config topic graduates, so
I'll see if I can apply a little tweak locally and make things work.

Thanks.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help