On 12/20/22 14:40, Ævar Arnfjörð Bjarmason wrote:> A proposed replacement for > https://lore.kernel.org/git/20221220123142.812965-1-hubertj@xxxxxxxxxxx/; > let's move forward & add a test rather than reverting away from the > subcommand APIe > > builtin/bundle.c | 2 +- > t/t6020-bundle-misc.sh | 7 +++++++ > 2 files changed, 8 insertions(+), 1 deletion(-) > > diff --git a/builtin/bundle.c b/builtin/bundle.c > index c12c09f8549..61c76284768 100644 > --- a/builtin/bundle.c > +++ b/builtin/bundle.c > @@ -58,7 +58,7 @@ static int parse_options_cmd_bundle(int argc, > int newargc; > newargc = parse_options(argc, argv, NULL, options, usagestr, > PARSE_OPT_STOP_AT_NON_OPTION); > - if (argc < 1) > + if (!newargc) > usage_with_options(usagestr, options); > *bundle_file = prefix_filename(prefix, argv[0]); > return newargc; > diff --git a/t/t6020-bundle-misc.sh b/t/t6020-bundle-misc.sh > index 833205125ab..3a1cf30b1d7 100755 > --- a/t/t6020-bundle-misc.sh > +++ b/t/t6020-bundle-misc.sh > @@ -11,6 +11,13 @@ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME > . ./test-lib.sh > . "$TEST_DIRECTORY"/lib-bundle.sh > > +for cmd in create verify list-heads unbundle > +do > + test_expect_success "usage: git bundle $cmd needs an argument" ' > + test_expect_code 129 git bundle $cmd > + ' > +done > + > # Create a commit or tag and set the variable with the object ID. > test_commit_setvar () { > notick= Seems to work. Thanks! Tested-by: Hubert Jasudowicz <hubertj@xxxxxxxxxxx> Hubert Jasudowicz
