diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-12-21 21:13:58 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-12-21 21:33:09 +0300 |
| commit | d6b6cd139359097f565023f9481c9943989e4463 (patch) | |
| tree | 0aca802897fa6d106fcab1caeff76a6437bd0bdf | |
| parent | 564d0252ca632e0264ed670534a51d18a689ef5d (diff) | |
archive: "--list" does not take further options
"git archive --list blah" should notice an extra command line
parameter that goes unused. Make it so.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | archive.c | 2 | ||||
| -rwxr-xr-x | t/t5000-tar-tree.sh | 10 |
2 files changed, 12 insertions, 0 deletions
@@ -685,6 +685,8 @@ static int parse_archive_args(int argc, const char **argv, base = ""; if (list) { + if (argc) + die(_("extra command line parameter '%s'"), *argv); for (i = 0; i < nr_archivers; i++) if (!is_remote || archivers[i]->flags & ARCHIVER_REMOTE) printf("%s\n", archivers[i]->name); diff --git a/t/t5000-tar-tree.sh b/t/t5000-tar-tree.sh index 4b4c3315d8..72b8d0ff02 100755 --- a/t/t5000-tar-tree.sh +++ b/t/t5000-tar-tree.sh @@ -124,6 +124,16 @@ test_expect_success 'setup' ' EOF ' +test_expect_success '--list notices extra parameters' ' + test_must_fail git archive --list blah && + test_must_fail git archive --remote=. --list blah +' + +test_expect_success 'end-of-options is correctly eaten' ' + git archive --list --end-of-options && + git archive --remote=. --list --end-of-options +' + test_expect_success 'populate workdir' ' mkdir a && echo simple textfile >a/a && |