commit-graph: show usage on "commit-graph [write|verify] garbage"
Change the parse_options() invocation in the commit-graph code to error on unknown leftover argv elements, in addition to the existing and implicit erroring via parse_options() on unknown options. We'd already error in cmd_commit_graph() on e.g.: git commit-graph unknown verify git commit-graph --unknown verify But here we're calling parse_options() twice more for the "write" and "verify" subcommands. We did not do the same checking for leftover argv elements there. As a result we'd silently accept garbage in these subcommands, let's not do that. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Reviewed-by: Taylor Blau <me@ttaylorr.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
070e7c5619
commit
6d209a01f8
@ -105,6 +105,8 @@ static int graph_verify(int argc, const char **argv)
|
|||||||
argc = parse_options(argc, argv, NULL,
|
argc = parse_options(argc, argv, NULL,
|
||||||
options,
|
options,
|
||||||
builtin_commit_graph_verify_usage, 0);
|
builtin_commit_graph_verify_usage, 0);
|
||||||
|
if (argc)
|
||||||
|
usage_with_options(builtin_commit_graph_verify_usage, options);
|
||||||
|
|
||||||
if (!opts.obj_dir)
|
if (!opts.obj_dir)
|
||||||
opts.obj_dir = get_object_directory();
|
opts.obj_dir = get_object_directory();
|
||||||
@ -262,6 +264,8 @@ static int graph_write(int argc, const char **argv)
|
|||||||
argc = parse_options(argc, argv, NULL,
|
argc = parse_options(argc, argv, NULL,
|
||||||
options,
|
options,
|
||||||
builtin_commit_graph_write_usage, 0);
|
builtin_commit_graph_write_usage, 0);
|
||||||
|
if (argc)
|
||||||
|
usage_with_options(builtin_commit_graph_write_usage, options);
|
||||||
|
|
||||||
if (opts.reachable + opts.stdin_packs + opts.stdin_commits > 1)
|
if (opts.reachable + opts.stdin_packs + opts.stdin_commits > 1)
|
||||||
die(_("use at most one of --reachable, --stdin-commits, or --stdin-packs"));
|
die(_("use at most one of --reachable, --stdin-commits, or --stdin-packs"));
|
||||||
|
@ -5,6 +5,11 @@ test_description='commit graph'
|
|||||||
|
|
||||||
GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS=0
|
GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS=0
|
||||||
|
|
||||||
|
test_expect_success 'usage' '
|
||||||
|
test_expect_code 129 git commit-graph write blah &&
|
||||||
|
test_expect_code 129 git commit-graph write verify
|
||||||
|
'
|
||||||
|
|
||||||
test_expect_success 'setup full repo' '
|
test_expect_success 'setup full repo' '
|
||||||
mkdir full &&
|
mkdir full &&
|
||||||
cd "$TRASH_DIRECTORY/full" &&
|
cd "$TRASH_DIRECTORY/full" &&
|
||||||
|
Reference in New Issue
Block a user