Skip to content

Commit

Permalink
Merge branch 'ps/bundle-verify-arg' into maint
Browse files Browse the repository at this point in the history
"git bundle verify" did not diagnose extra parameters on the
command line.

* ps/bundle-verify-arg:
  bundle: verify arguments more strictly
  • Loading branch information
Junio C Hamano committed Jun 5, 2015
2 parents 7c997bc + 7886cfa commit 51f319c
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions builtin/bundle.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand Down

0 comments on commit 51f319c

Please sign in to comment.