mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ps/bundle-verify-arg'

Browse Source 
"git bundle verify" did not diagnose extra parameters on the
command line.

* ps/bundle-verify-arg:
  bundle: verify arguments more strictly
This commit is contained in:
Junio C Hamano
2015-05-22 12:41:46 -07:00
parent 39fa79178f 7886cfa080
commit 44fa796793
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
builtin/bundle.c
View File

@ -42,6 +42,10 @@ int cmd_bundle(int argc, const char **argv, const char *prefix)
if (!strcmp(cmd, "verify")) { if (!strcmp(cmd, "verify")) {
close(bundle_fd); close(bundle_fd);
if (argc != 1) {
usage(builtin_bundle_usage);
return 1;
}
if (verify_bundle(&header, 1)) if (verify_bundle(&header, 1))
return 1; return 1;
fprintf(stderr, _("%s is okay\n"), bundle_file); 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); return !!list_bundle_refs(&header, argc, argv);
} }
if (!strcmp(cmd, "create")) { if (!strcmp(cmd, "create")) {
if (argc < 2) {
usage(builtin_bundle_usage);
return 1;
}
if (!startup_info->have_repository) if (!startup_info->have_repository)
die(_("Need a repository to create a bundle.")); die(_("Need a repository to create a bundle."));
return !!create_bundle(&header, bundle_file, argc, argv); return !!create_bundle(&header, bundle_file, argc, argv);