зеркало из https://github.com/microsoft/git.git
bundle: verify arguments more strictly
The `verify` and `create` subcommands of the bundle builtin do not properly verify the command line arguments that have been passed in. While the `verify` subcommand accepts an arbitrary amount of ignored arguments the `create` subcommand does not complain about being passed too few arguments, resulting in a bogus call to `git rev-list`. Fix these errors by verifying that the correct amount of arguments has been passed in. Signed-off-by: Patrick Steinhardt <ps@pks.im> Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
282616c72d
Коммит
7886cfa080
|
@ -42,6 +42,10 @@ int cmd_bundle(int argc, const char **argv, const char *prefix)
|
|||
|
||||
if (!strcmp(cmd, "verify")) {
|
||||
close(bundle_fd);
|
||||
if (argc != 1) {
|
||||
usage(builtin_bundle_usage);
|
||||
return 1;
|
||||
}
|
||||
if (verify_bundle(&header, 1))
|
||||
return 1;
|
||||
fprintf(stderr, _("%s is okay\n"), bundle_file);
|
||||
|
@ -52,6 +56,10 @@ int cmd_bundle(int argc, const char **argv, const char *prefix)
|
|||
return !!list_bundle_refs(&header, argc, argv);
|
||||
}
|
||||
if (!strcmp(cmd, "create")) {
|
||||
if (argc < 2) {
|
||||
usage(builtin_bundle_usage);
|
||||
return 1;
|
||||
}
|
||||
if (!startup_info->have_repository)
|
||||
die(_("Need a repository to create a bundle."));
|
||||
return !!create_bundle(&header, bundle_file, argc, argv);
|
||||
|
|
Загрузка…
Ссылка в новой задаче