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>
Ævar Arnfjörð Bjarmason committed
Aug 23, 2021 at 14:30 UTC
6d209a01f89fd27d42e0a74a5ada29cef1dcac29
2 files changed
+9
builtin/commit-graph.c
+4
@@ -105,6 +105,8 @@ static int graph_verify(int argc, const char **argv)
105
argc = parse_options(argc, argv, NULL,
106
options,
107
builtin_commit_graph_verify_usage, 0);
108
+ if (argc)
109
+ usage_with_options(builtin_commit_graph_verify_usage, options);
110
111
if (!opts.obj_dir)
112
opts.obj_dir = get_object_directory();
@@ -262,6 +264,8 @@ static int graph_write(int argc, const char **argv)
264
argc = parse_options(argc, argv, NULL,
265
options,
266
builtin_commit_graph_write_usage, 0);
267
+ if (argc)
268
+ usage_with_options(builtin_commit_graph_write_usage, options);
269
270
if (opts.reachable + opts.stdin_packs + opts.stdin_commits > 1)
271
die(_("use at most one of --reachable, --stdin-commits, or --stdin-packs"));
t/t5318-commit-graph.sh
+5
@@ -5,6 +5,11 @@ test_description='commit graph'
5
6
GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS=0
7
8
+test_expect_success 'usage' '
9
+ test_expect_code 129 git commit-graph write blah &&
10
+ test_expect_code 129 git commit-graph write verify
11
+'
12
+
13
test_expect_success 'setup full repo' '
14
mkdir full &&
15
cd "$TRASH_DIRECTORY/full" &&