From: Derrick Stolee Date: Thu, 26 Mar 2026 15:14:54 +0000 (+0000) Subject: t5620: test backfill's unknown argument handling X-Git-Tag: v2.54.0-rc1~34^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=46d1f4cf4dcb8aaf799f78410af829e149086f36;p=thirdparty%2Fgit.git t5620: test backfill's unknown argument handling Before the recent changes to parse rev-list arguments inside of 'git backfill', the builtin would take arbitrary arguments without complaint (and ignore them). This was noticed and a patch was sent [1] which motivates this change. [1] https://lore.kernel.org/git/20260321031643.5185-1-r.siddharth.shrimali@gmail.com/ Note that the revision machinery can output an "ambiguous argument" warning if a value not starting with '--' is found and doesn't make sense as a reference or a pathspec. For unrecognized arguments starting with '--' we need to add logic into builtin/backfill.c to catch leftover arguments. Reported-by: Siddharth Shrimali Signed-off-by: Derrick Stolee Signed-off-by: Junio C Hamano --- diff --git a/builtin/backfill.c b/builtin/backfill.c index b98b0b591f..2c5ce56fb7 100644 --- a/builtin/backfill.c +++ b/builtin/backfill.c @@ -142,6 +142,9 @@ int cmd_backfill(int argc, const char **argv, const char *prefix, struct reposit repo_init_revisions(repo, &ctx.revs, prefix); argc = setup_revisions(argc, argv, &ctx.revs, NULL); + if (argc > 1) + die(_("unrecognized argument: %s"), argv[1]); + repo_config(repo, git_default_config, NULL); if (ctx.sparse < 0) diff --git a/t/t5620-backfill.sh b/t/t5620-backfill.sh index c6f54ee91c..2c347a91fe 100755 --- a/t/t5620-backfill.sh +++ b/t/t5620-backfill.sh @@ -7,6 +7,14 @@ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh +test_expect_success 'backfill rejects unexpected arguments' ' + test_must_fail git backfill unexpected-arg 2>err && + test_grep "ambiguous argument .*unexpected-arg" err && + + test_must_fail git backfill --all --unexpected-arg --first-parent 2>err && + test_grep "unrecognized argument: --unexpected-arg" err +' + # We create objects in the 'src' repo. test_expect_success 'setup repo for object creation' ' echo "{print \$1}" >print_1.awk &&