bundle: define subcommand -h in terms of command -h

Avoid repeating the "-h" output for the "git bundle" command, and
instead define the usage of each subcommand with macros, so that the
"-h" output for the command itself can re-use those definitions. See
[1], [2] and [3] for prior art using the same pattern.

1. b25b727494f (builtin/multi-pack-index.c: define common usage with a
   macro, 2021-03-30)
2. 8757b35d443 (commit-graph: define common usage with a macro,
   2021-08-23)
3. 1e91d3faf6c (reflog: move "usage" variables and use macros,
   2022-03-17)

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/bundle.c b/builtin/bundle.c
index 5c78894afd5475c4cb2f53bd9a20b683362c6178..1b08700bf9e6a72feeb6ddee56ee64dd2ec0a04f 100644 (file)
--- a/builtin/bundle.c
+++ b/builtin/bundle.c
@@ -11,31 +11,40 @@
  * bundle supporting "fetch", "pull", and "ls-remote".
  */
 
-static const char * const builtin_bundle_usage[] = {
-       N_("git bundle create [<options>] <file> <git-rev-list args>"),
-       N_("git bundle verify [<options>] <file>"),
-       N_("git bundle list-heads <file> [<refname>...]"),
-       N_("git bundle unbundle <file> [<refname>...]"),
-       NULL
+#define BUILTIN_BUNDLE_CREATE_USAGE \
+       N_("git bundle create [<options>] <file> <git-rev-list args>")
+#define BUILTIN_BUNDLE_VERIFY_USAGE \
+       N_("git bundle verify [<options>] <file>")
+#define BUILTIN_BUNDLE_LIST_HEADS_USAGE \
+       N_("git bundle list-heads <file> [<refname>...]")
+#define BUILTIN_BUNDLE_UNBUNDLE_USAGE \
+       N_("git bundle unbundle <file> [<refname>...]")
+
+static char const * const builtin_bundle_usage[] = {
+       BUILTIN_BUNDLE_CREATE_USAGE,
+       BUILTIN_BUNDLE_VERIFY_USAGE,
+       BUILTIN_BUNDLE_LIST_HEADS_USAGE,
+       BUILTIN_BUNDLE_UNBUNDLE_USAGE,
+       NULL,
 };
 
 static const char * const builtin_bundle_create_usage[] = {
-       N_("git bundle create [<options>] <file> <git-rev-list args>"),
+       BUILTIN_BUNDLE_CREATE_USAGE,
        NULL
 };
 
 static const char * const builtin_bundle_verify_usage[] = {
-       N_("git bundle verify [<options>] <file>"),
+       BUILTIN_BUNDLE_VERIFY_USAGE,
        NULL
 };
 
 static const char * const builtin_bundle_list_heads_usage[] = {
-       N_("git bundle list-heads <file> [<refname>...]"),
+       BUILTIN_BUNDLE_LIST_HEADS_USAGE,
        NULL
 };
 
 static const char * const builtin_bundle_unbundle_usage[] = {
-       N_("git bundle unbundle <file> [<refname>...]"),
+       BUILTIN_BUNDLE_UNBUNDLE_USAGE,
        NULL
 };