From: "Brian Lyles" <brianmlyles@gmail.com>
To: "Junio C Hamano" <gitster@pobox.com>
Cc: <git@vger.kernel.org>
Subject: Re: What's cooking in git.git (Mar 2024, #05; Tue, 19)
Date: Wed, 20 Mar 2024 15:15:56 +0000 [thread overview]
Message-ID: <17be81eb83ff314d.70b1dd9aae081c6e.203dcd72f6563036@zivdesk> (raw)
In-Reply-To: <xmqqil1iqi37.fsf@gitster.g>
Hi Junio
> * bl/cherry-pick-empty (2024-03-11) 7 commits
> - cherry-pick: add `--empty` for more robust redundant commit handling
> - cherry-pick: enforce `--keep-redundant-commits` incompatibility
> - sequencer: do not require `allow_empty` for redundant commit options
> - sequencer: treat error reading HEAD as unborn branch
> - rebase: update `--empty=ask` to `--empty=stop`
> - docs: clean up `--empty` formatting in git-rebase(1) and git-am (1)
> - docs: address inaccurate `--empty` default with `--exec`
>
> "cherry-pick" told to keep redundant commits needs to be allowed to
> create empty commits to do its job, but it required the user to
> give the --allow-empty option, which was unnecessary. Its UI has
> also been tweaked a bit.
Note that the description here is a little out-of-date; we're no longer
changing the relationship between --allow-empty and
--keep-redundant-commits (and the user didn't have to manually supply
--allow-empty previously). I'd summarize this as:
Allow git-cherry-pick(1) to automatically drop redundant commits via
a new `--empty` option, similar to the `--empty` options for
git-rebase(1) and git-am(1). Includes a soft deprecation of
`--keep-redundant-commits` as well as some related docs changes and
sequencer code cleanup.
> Comments?
> source: <20240119060721.3734775-2-brianmlyles@gmail.com>
You can expect a v4 reroll tonight to address a few remaining comments.
The only thing I haven't heard back on is this change [1] to the docs
for the new `--empty` option, but I'm confident enough in my proposed
alternative there that I'm comfortable rerolling even if I don't hear
back today.
[1]: https://lore.kernel.org/git/CAHPHrSfiMbU55K2=8+hJZy1cMSRbYM77pCK8BdcAPHLvapHO_A@mail.gmail.com/
--
Thank you,
Brian Lyles
next prev parent reply other threads:[~2024-03-20 15:16 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-19 16:53 What's cooking in git.git (Mar 2024, #05; Tue, 19) Junio C Hamano
2024-03-20 15:15 ` Brian Lyles [this message]
2024-03-20 16:11 ` Junio C Hamano
2024-03-21 1:13 ` Brian Lyles
2024-03-21 1:36 ` Junio C Hamano
2024-03-21 2:04 ` Brian Lyles
2024-03-21 13:02 ` Junio C Hamano
2024-03-22 1:22 ` Brian Lyles
2024-03-22 1:59 ` Junio C Hamano
2024-03-22 2:47 ` Brian Lyles
2024-03-22 5:14 ` Dragan Simic
2024-03-22 12:39 ` Max Gautier
2024-03-22 13:25 ` Dragan Simic
2024-03-22 14:46 ` Junio C Hamano
2024-03-22 5:05 ` Dragan Simic
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=17be81eb83ff314d.70b1dd9aae081c6e.203dcd72f6563036@zivdesk \
--to=brianmlyles@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).