Merge branch 'rj/prune-packed-excess-args'
authorJunio C Hamano <gitster@pobox.com>
Thu, 7 Mar 2019 00:59:55 +0000 (09:59 +0900)
committerJunio C Hamano <gitster@pobox.com>
Thu, 7 Mar 2019 00:59:55 +0000 (09:59 +0900)
"git prune-packed" did not notice and complain against excess
arguments given from the command line, which now it does.

* rj/prune-packed-excess-args:
prune-packed: check for too many arguments

1  2 
builtin/prune-packed.c
diff --combined builtin/prune-packed.c
index a9e7b552b9d117c5f1078a0dd5864bbed724c6b6,b22b1a0539de206f6f2328fc0f7e1e7190b63ff1..48c5e78e339dbd32db255382f729ca2e65b514c5
@@@ -3,7 -3,6 +3,7 @@@
  #include "progress.h"
  #include "parse-options.h"
  #include "packfile.h"
 +#include "object-store.h"
  
  static const char * const prune_packed_usage[] = {
        N_("git prune-packed [-n | --dry-run] [-q | --quiet]"),
@@@ -63,6 -62,11 +63,11 @@@ int cmd_prune_packed(int argc, const ch
        argc = parse_options(argc, argv, prefix, prune_packed_options,
                             prune_packed_usage, 0);
  
+       if (argc > 0)
+               usage_msg_opt(_("too many arguments"),
+                             prune_packed_usage,
+                             prune_packed_options);
        prune_packed_objects(opts);
        return 0;
  }