Merge branch 'jp/maint-send-email-fold'

diff --git a/builtin-bundle.c b/builtin-bundle.c
index 9f38e2176a4c05fe9f6f8efcabb9b1e7204fdb85..2006cc5cd5cc4d381189f5cf7bdd09fcdd66b9ca 100644 (file)
--- a/builtin-bundle.c
+++ b/builtin-bundle.c
@@ -6,21 +6,25 @@
  * Basic handler for bundle files to connect repositories via sneakernet.
  * Invocation must include action.
  * This function can create a bundle or provide information on an existing
- * bundle supporting git-fetch, git-pull, and git-ls-remote
+ * bundle supporting "fetch", "pull", and "ls-remote".
  */
 
-static const char *bundle_usage="git-bundle (create <bundle> <git-rev-list args> | verify <bundle> | list-heads <bundle> [refname]... | unbundle <bundle> [refname]... )";
+static const char builtin_bundle_usage[] =
+  "git bundle create <file> <git-rev-list args>\n"
+  "   or: git bundle verify <file>\n"
+  "   or: git bundle list-heads <file> [refname...]\n"
+  "   or: git bundle unbundle <file> [refname...]";
 
 int cmd_bundle(int argc, const char **argv, const char *prefix)
 {
        struct bundle_header header;
-       int nongit = 0;
+       int nongit;
        const char *cmd, *bundle_file;
        int bundle_fd = -1;
        char buffer[PATH_MAX];
 
        if (argc < 3)
-               usage(bundle_usage);
+               usage(builtin_bundle_usage);
 
        cmd = argv[1];
        bundle_file = argv[2];
@@ -59,5 +63,5 @@ int cmd_bundle(int argc, const char **argv, const char *prefix)
                return !!unbundle(&header, bundle_fd) ||
                        list_bundle_refs(&header, argc, argv);
        } else
-               usage(bundle_usage);
+               usage(builtin_bundle_usage);
 }