summaryrefslogtreecommitdiff
path: root/builtin/bundle.c
diff options
context:
space:
mode:
authorPatrick Steinhardt <ps@pks.im>2015-05-08 08:02:00 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-05-08 17:52:11 (GMT)
commit7886cfa08054046a7a82726be4b8c109b2ba1344 (patch)
tree4a85ac80e921487773c25cf90a89750bce5100e4 /builtin/bundle.c
parent282616c72d1d08a77ca4fe1186cb708c38408d87 (diff)
downloadgit-7886cfa08054046a7a82726be4b8c109b2ba1344.zip
git-7886cfa08054046a7a82726be4b8c109b2ba1344.tar.gz
git-7886cfa08054046a7a82726be4b8c109b2ba1344.tar.bz2
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>
Diffstat (limited to 'builtin/bundle.c')
-rw-r--r--builtin/bundle.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/builtin/bundle.c b/builtin/bundle.c
index 92a8a60..4883a43 100644
--- a/builtin/bundle.c
+++ b/builtin/bundle.c
@@ -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);