| Message ID | d0a991cf4f892e73e4fd62ef3fdae3fa73277321.1698152926.git.ps@pks.im (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | show-ref: introduce mode to check for ref existence | expand |
On Tue, Oct 24, 2023 at 9:11 AM Patrick Steinhardt <ps@pks.im> wrote: > The git-show-ref(1) command has three different modes, of which one is > implicit and the other two can be chosen explicitly by passing a flag. > But while these modes are standalone and cause us to execute completely > separate code paths, we gladly accept the case where a user asks for > both `--exclude-existing` and `--verify` at the same time even though it > is not obvious what will happen. Spoiler: we ignore `--verify` and > execute the `--exclude-existing` mode. > > Let's explicitly detect this invalid usage and die in case both modes > were requested. > > Signed-off-by: Patrick Steinhardt <ps@pks.im> > --- > diff --git a/builtin/show-ref.c b/builtin/show-ref.c > @@ -269,6 +269,9 @@ int cmd_show_ref(int argc, const char **argv, const char *prefix) > + if ((!!exclude_existing_opts.enabled + !!verify) > 1) > + die(_("only one of --exclude-existing or --verify can be given")); Somewhat recently, work was done to normalize this sort of message. The result was to instead use the phrasing "options '%s' and '%s' cannot be used together". See, for instance, 43ea635c35 (i18n: refactor "foo and bar are mutually exclusive", 2022-01-05).
diff --git a/builtin/show-ref.c b/builtin/show-ref.c index 5d5d7d22ed1..10d0213e687 100644 --- a/builtin/show-ref.c +++ b/builtin/show-ref.c @@ -269,6 +269,9 @@ int cmd_show_ref(int argc, const char **argv, const char *prefix) argc = parse_options(argc, argv, prefix, show_ref_options, show_ref_usage, 0); + if ((!!exclude_existing_opts.enabled + !!verify) > 1) + die(_("only one of --exclude-existing or --verify can be given")); + if (exclude_existing_opts.enabled) return cmd_show_ref__exclude_existing(&exclude_existing_opts); else if (verify) diff --git a/t/t1403-show-ref.sh b/t/t1403-show-ref.sh index 9252a581abf..3a312c8b27c 100755 --- a/t/t1403-show-ref.sh +++ b/t/t1403-show-ref.sh @@ -196,4 +196,9 @@ test_expect_success 'show-ref --verify with dangling ref' ' ) ' +test_expect_success 'show-ref sub-modes are mutually exclusive' ' + test_must_fail git show-ref --verify --exclude-existing 2>err && + grep "only one of --exclude-existing or --verify can be given" err +' + test_done
The git-show-ref(1) command has three different modes, of which one is implicit and the other two can be chosen explicitly by passing a flag. But while these modes are standalone and cause us to execute completely separate code paths, we gladly accept the case where a user asks for both `--exclude-existing` and `--verify` at the same time even though it is not obvious what will happen. Spoiler: we ignore `--verify` and execute the `--exclude-existing` mode. Let's explicitly detect this invalid usage and die in case both modes were requested. Signed-off-by: Patrick Steinhardt <ps@pks.im> --- builtin/show-ref.c | 3 +++ t/t1403-show-ref.sh | 5 +++++ 2 files changed, 8 insertions(+)