From: Phillip Wood <phillip.wood123@gmail.com>
To: Brian Lyles <brianmlyles@gmail.com>, git@vger.kernel.org
Cc: newren@gmail.com, me@ttaylorr.com, gitster@pobox.com
Subject: Re: [PATCH v2 7/8] cherry-pick: enforce `--keep-redundant-commits` incompatibility
Date: Thu, 22 Feb 2024 16:35:54 +0000 [thread overview]
Message-ID: <8c2eec1b-9a59-4739-a903-b2e8955f3ff5@gmail.com> (raw)
In-Reply-To: <20240210074859.552497-8-brianmlyles@gmail.com>
Hi Brian
On 10/02/2024 07:43, Brian Lyles wrote:
> When `--keep-redundant-commits` was added in b27cfb0d8d
> (git-cherry-pick: Add keep-redundant-commits option, 2012-04-20), it was
> not marked as incompatible with the various operations needed to
> continue or exit a cherry-pick (`--continue`, `--skip`, `--abort`, and
> `--quit`).
>
> Enforce this incompatibility via `verify_opt_compatible` like we do for
> the other various options.
>
> Signed-off-by: Brian Lyles <brianmlyles@gmail.com>
> ---
>
> This commit was not present in v1 either. It addresses an existing issue
> that I noticed after Phillip pointed out the same deficiency for my new
> `--empty` option introduced in the ultimate commit in this series.
Well spotted, do we really need a new test file just for this though? I
wonder if the new test would be better off living in
t3505-cherry-pick-empty.sh or t3507-cherry-pick-conflict.sh
Best Wishes
Phillip
> [1]: https://lore.kernel.org/git/CAHPHrSf+joHe6ikErHLgWrk-_qjSROS-dXCHagxWGDAF=2deDg@mail.gmail.com/
>
> builtin/revert.c | 1 +
> t/t3515-cherry-pick-incompatible-options.sh | 34 +++++++++++++++++++++
> 2 files changed, 35 insertions(+)
> create mode 100755 t/t3515-cherry-pick-incompatible-options.sh
>
> diff --git a/builtin/revert.c b/builtin/revert.c
> index d83977e36e..48c426f277 100644
> --- a/builtin/revert.c
> +++ b/builtin/revert.c
> @@ -163,6 +163,7 @@ static int run_sequencer(int argc, const char **argv, const char *prefix,
> "--ff", opts->allow_ff,
> "--rerere-autoupdate", opts->allow_rerere_auto == RERERE_AUTOUPDATE,
> "--no-rerere-autoupdate", opts->allow_rerere_auto == RERERE_NOAUTOUPDATE,
> + "--keep-redundant-commits", opts->keep_redundant_commits,
> NULL);
> }
>
> diff --git a/t/t3515-cherry-pick-incompatible-options.sh b/t/t3515-cherry-pick-incompatible-options.sh
> new file mode 100755
> index 0000000000..6100ab64fd
> --- /dev/null
> +++ b/t/t3515-cherry-pick-incompatible-options.sh
> @@ -0,0 +1,34 @@
> +#!/bin/sh
> +
> +test_description='test if cherry-pick detects and aborts on incompatible options'
> +
> +. ./test-lib.sh
> +
> +test_expect_success setup '
> +
> + echo first > file1 &&
> + git add file1 &&
> + test_tick &&
> + git commit -m "first" &&
> +
> + echo second > file1 &&
> + git add file1 &&
> + test_tick &&
> + git commit -m "second"
> +'
> +
> +test_expect_success '--keep-redundant-commits is incompatible with operations' '
> + test_must_fail git cherry-pick HEAD 2>output &&
> + test_grep "The previous cherry-pick is now empty" output &&
> + test_must_fail git cherry-pick --keep-redundant-commits --continue 2>output &&
> + test_grep "fatal: cherry-pick: --keep-redundant-commits cannot be used with --continue" output &&
> + test_must_fail git cherry-pick --keep-redundant-commits --skip 2>output &&
> + test_grep "fatal: cherry-pick: --keep-redundant-commits cannot be used with --skip" output &&
> + test_must_fail git cherry-pick --keep-redundant-commits --abort 2>output &&
> + test_grep "fatal: cherry-pick: --keep-redundant-commits cannot be used with --abort" output &&
> + test_must_fail git cherry-pick --keep-redundant-commits --quit 2>output &&
> + test_grep "fatal: cherry-pick: --keep-redundant-commits cannot be used with --quit" output &&
> + git cherry-pick --abort
> +'
> +
> +test_done
next prev parent reply other threads:[~2024-02-22 16:36 UTC|newest]
Thread overview: 118+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-19 5:59 [PATCH 1/4] sequencer: Do not require `allow_empty` for redundant commit options brianmlyles
2024-01-19 5:59 ` [PATCH 2/4] docs: Clean up `--empty` formatting in `git-rebase` and `git-am` brianmlyles
2024-01-23 14:24 ` Phillip Wood
2024-01-27 21:22 ` Brian Lyles
2024-02-01 14:02 ` Phillip Wood
2024-01-19 5:59 ` [PATCH 3/4] rebase: Update `--empty=ask` to `--empty=drop` brianmlyles
2024-01-23 14:24 ` Phillip Wood
2024-01-27 21:49 ` Brian Lyles
2024-02-01 14:02 ` Phillip Wood
2024-01-19 5:59 ` [PATCH 4/4] cherry-pick: Add `--empty` for more robust redundant commit handling brianmlyles
2024-01-20 20:24 ` Kristoffer Haugsbakk
2024-01-21 18:28 ` Brian Lyles
2024-01-21 22:05 ` Kristoffer Haugsbakk
2024-01-21 22:41 ` Junio C Hamano
2024-01-22 10:40 ` Phillip Wood
2024-01-22 20:55 ` Kristoffer Haugsbakk
2024-01-23 5:23 ` Brian Lyles
2024-01-23 7:11 ` Kristoffer Haugsbakk
2024-01-23 17:32 ` Junio C Hamano
2024-01-23 18:41 ` Subject: [PATCH] CoC: whitespace fix Junio C Hamano
2024-01-24 3:06 ` Elijah Newren
2024-01-23 18:49 ` [PATCH 4/4] cherry-pick: Add `--empty` for more robust redundant commit handling Junio C Hamano
2024-01-23 14:25 ` Phillip Wood
2024-01-23 18:01 ` Junio C Hamano
2024-01-28 0:07 ` Brian Lyles
2024-01-27 23:56 ` Brian Lyles
2024-01-20 21:38 ` [PATCH 1/4] sequencer: Do not require `allow_empty` for redundant commit options Kristoffer Haugsbakk
2024-01-21 18:19 ` Brian Lyles
2024-01-23 14:23 ` Phillip Wood
2024-01-23 18:18 ` Junio C Hamano
2024-01-24 11:01 ` Phillip Wood
2024-01-24 11:01 ` Phillip Wood
2024-01-27 23:30 ` Brian Lyles
2024-01-28 16:36 ` Brian Lyles
2024-01-29 10:55 ` Phillip Wood
2024-02-10 5:50 ` Brian Lyles
2024-02-01 10:57 ` Phillip Wood
2024-02-10 4:34 ` Brian Lyles
2024-02-10 7:43 ` [PATCH v2 0/8] cherry-pick: add `--empty` Brian Lyles
2024-02-22 16:39 ` phillip.wood123
2024-02-10 7:43 ` [PATCH v2 1/8] docs: address inaccurate `--empty` default with `--exec` Brian Lyles
2024-02-10 7:43 ` [PATCH v2 2/8] docs: clean up `--empty` formatting in git-rebase(1) and git-am(1) Brian Lyles
2024-02-10 7:43 ` [PATCH v2 3/8] rebase: update `--empty=ask` to `--empty=drop` Brian Lyles
2024-02-11 4:54 ` Brian Lyles
2024-02-14 11:05 ` Phillip Wood
2024-02-22 16:34 ` phillip.wood123
2024-02-22 18:27 ` Junio C Hamano
2024-02-10 7:43 ` [PATCH v2 4/8] sequencer: treat error reading HEAD as unborn branch Brian Lyles
2024-02-22 16:34 ` phillip.wood123
2024-02-23 5:28 ` Brian Lyles
2024-02-25 16:57 ` phillip.wood123
2024-02-10 7:43 ` [PATCH v2 5/8] sequencer: do not require `allow_empty` for redundant commit options Brian Lyles
2024-02-22 16:35 ` phillip.wood123
2024-02-10 7:43 ` [PATCH v2 6/8] cherry-pick: decouple `--allow-empty` and `--keep-redundant-commits` Brian Lyles
2024-02-22 16:35 ` Phillip Wood
2024-02-22 18:41 ` Junio C Hamano
2024-02-10 7:43 ` [PATCH v2 7/8] cherry-pick: enforce `--keep-redundant-commits` incompatibility Brian Lyles
2024-02-22 16:35 ` Phillip Wood [this message]
2024-02-23 6:23 ` Brian Lyles
2024-02-23 17:41 ` Junio C Hamano
2024-02-25 16:58 ` phillip.wood123
2024-02-26 3:04 ` Brian Lyles
2024-02-10 7:43 ` [PATCH v2 8/8] cherry-pick: add `--empty` for more robust redundant commit handling Brian Lyles
2024-02-11 20:50 ` Jean-Noël AVILA
2024-02-12 1:35 ` Brian Lyles
2024-02-22 16:36 ` phillip.wood123
2024-02-23 6:58 ` Brian Lyles
2024-02-25 16:57 ` phillip.wood123
2024-02-26 2:21 ` Brian Lyles
2024-02-26 3:32 ` Brian Lyles
2024-02-27 10:39 ` phillip.wood123
2024-02-27 17:33 ` Junio C Hamano
2024-03-10 18:41 ` [PATCH v3 0/7] " Brian Lyles
2024-03-13 16:12 ` phillip.wood123
2024-03-10 18:42 ` [PATCH v3 1/7] docs: address inaccurate `--empty` default with `--exec` Brian Lyles
2024-03-10 18:42 ` [PATCH v3 2/7] docs: clean up `--empty` formatting in git-rebase(1) and git-am(1) Brian Lyles
2024-03-10 18:42 ` [PATCH v3 3/7] rebase: update `--empty=ask` to `--empty=stop` Brian Lyles
2024-03-10 18:42 ` [PATCH v3 4/7] sequencer: treat error reading HEAD as unborn branch Brian Lyles
2024-03-11 0:07 ` Junio C Hamano
2024-03-11 16:54 ` Junio C Hamano
2024-03-12 2:04 ` Brian Lyles
2024-03-12 22:25 ` Junio C Hamano
2024-03-16 3:05 ` Brian Lyles
2024-03-13 15:10 ` phillip.wood123
2024-03-16 3:07 ` Brian Lyles
2024-03-10 18:42 ` [PATCH v3 5/7] sequencer: do not require `allow_empty` for redundant commit options Brian Lyles
2024-03-10 18:42 ` [PATCH v3 6/7] cherry-pick: enforce `--keep-redundant-commits` incompatibility Brian Lyles
2024-03-10 18:42 ` [PATCH v3 7/7] cherry-pick: add `--empty` for more robust redundant commit handling Brian Lyles
2024-03-13 16:10 ` phillip.wood123
2024-03-13 17:17 ` Junio C Hamano
2024-03-16 5:20 ` Brian Lyles
2024-03-20 19:35 ` phillip.wood123
2024-03-20 23:36 ` [PATCH v4 0/7] " Brian Lyles
2024-03-25 14:38 ` phillip.wood123
2024-03-25 16:12 ` Brian Lyles
2024-03-25 19:36 ` phillip.wood123
2024-03-25 20:57 ` Junio C Hamano
2024-03-20 23:36 ` [PATCH v4 1/7] docs: address inaccurate `--empty` default with `--exec` Brian Lyles
2024-03-20 23:36 ` [PATCH v4 2/7] docs: clean up `--empty` formatting in git-rebase(1) and git-am(1) Brian Lyles
2024-03-20 23:36 ` [PATCH v4 3/7] rebase: update `--empty=ask` to `--empty=stop` Brian Lyles
2024-03-20 23:36 ` [PATCH v4 4/7] sequencer: handle unborn branch with `--allow-empty` Brian Lyles
2024-03-21 9:52 ` Dirk Gouders
2024-03-21 16:22 ` Junio C Hamano
2024-03-21 19:45 ` Dirk Gouders
2024-03-20 23:37 ` [PATCH v4 5/7] sequencer: do not require `allow_empty` for redundant commit options Brian Lyles
2024-03-20 23:37 ` [PATCH v4 6/7] cherry-pick: enforce `--keep-redundant-commits` incompatibility Brian Lyles
2024-03-20 23:37 ` [PATCH v4 7/7] cherry-pick: add `--empty` for more robust redundant commit handling Brian Lyles
2024-03-25 23:16 ` [PATCH v5 0/7] " Brian Lyles
2024-03-26 14:45 ` phillip.wood123
2024-03-26 18:28 ` Junio C Hamano
2024-03-27 16:37 ` phillip.wood123
2024-03-25 23:16 ` [PATCH v5 1/7] docs: address inaccurate `--empty` default with `--exec` Brian Lyles
2024-03-25 23:16 ` [PATCH v5 2/7] docs: clean up `--empty` formatting in git-rebase(1) and git-am(1) Brian Lyles
2024-03-25 23:16 ` [PATCH v5 3/7] rebase: update `--empty=ask` to `--empty=stop` Brian Lyles
2024-03-25 23:16 ` [PATCH v5 4/7] sequencer: handle unborn branch with `--allow-empty` Brian Lyles
2024-03-25 23:16 ` [PATCH v5 5/7] sequencer: do not require `allow_empty` for redundant commit options Brian Lyles
2024-03-25 23:16 ` [PATCH v5 6/7] cherry-pick: enforce `--keep-redundant-commits` incompatibility Brian Lyles
2024-03-25 23:16 ` [PATCH v5 7/7] cherry-pick: add `--empty` for more robust redundant commit handling Brian Lyles
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=8c2eec1b-9a59-4739-a903-b2e8955f3ff5@gmail.com \
--to=phillip.wood123@gmail.com \
--cc=brianmlyles@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=me@ttaylorr.com \
--cc=newren@gmail.com \
--cc=phillip.wood@dunelm.org.uk \
/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).