Skip to content

Commit b6423f9

Browse files
committed
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 <r.siddharth.shrimali@gmail.com> Signed-off-by: Derrick Stolee <stolee@gmail.com>
1 parent 1ea278b commit b6423f9

2 files changed

Lines changed: 11 additions & 0 deletions

File tree

builtin/backfill.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,9 @@ int cmd_backfill(int argc, const char **argv, const char *prefix, struct reposit
142142
repo_init_revisions(repo, &ctx.revs, prefix);
143143
argc = setup_revisions(argc, argv, &ctx.revs, NULL);
144144

145+
if (argc > 1)
146+
die(_("unrecognized argument: %s"), argv[1]);
147+
145148
repo_config(repo, git_default_config, NULL);
146149

147150
if (ctx.sparse < 0)

t/t5620-backfill.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,14 @@ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
77

88
. ./test-lib.sh
99

10+
test_expect_success 'backfill rejects unexpected arguments' '
11+
test_must_fail git backfill unexpected-arg 2>err &&
12+
test_grep "ambiguous argument .*unexpected-arg" err &&
13+
14+
test_must_fail git backfill --all --unexpected-arg --first-parent 2>err &&
15+
test_grep "unrecognized argument: --unexpected-arg" err
16+
'
17+
1018
# We create objects in the 'src' repo.
1119
test_expect_success 'setup repo for object creation' '
1220
echo "{print \$1}" >print_1.awk &&

0 commit comments

Comments
 (0)