{"thread":{"id":"21006","subject":"[PATCH] Trivial fix: Make all the builtin usage strings to use the same pattern.","startedAt":"2009-09-20T13:17:25Z","lastAt":"2009-09-21T21:39:45Z","messageCount":7,"participants":["Thiago Farina","Johannes Gilger","Brandon Casey","Johannes Sixt"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"123537","messageId":"1253452645-3220-1-git-send-email-tfransosi@gmail.com","threadId":"21006","inReplyTo":null,"subject":"[PATCH] Trivial fix: Make all the builtin usage strings to use the same pattern.","fromName":"Thiago Farina","fromEmail":"tfransosi@gmail.com","sentAt":"2009-09-20T13:17:25Z","receivedAt":"2009-09-20T13:17:25Z","isPatch":true,"sender":{"key":"tfransosi@gmail.com","avatar":"https://avatars.githubusercontent.com/u/970071?v=4"},"body":"They follow the pattern of file name:\nFile name pattern: builtin-command-name.c\nUsage string pattern: builtin_command_name_usage\n\nSigned-off-by: Thiago Farina <tfransosi@gmail.com>\n---\n archive.c                    |    2 +-\n builtin-apply.c              |    4 ++--\n builtin-bisect--helper.c     |    6 +++---\n builtin-blame.c              |    9 +++++----\n builtin-cat-file.c           |   12 ++++++------\n builtin-check-attr.c         |    8 ++++----\n builtin-checkout.c           |    4 ++--\n builtin-clean.c              |    2 +-\n builtin-commit-tree.c        |    7 ++++---\n builtin-config.c             |    2 +-\n builtin-count-objects.c      |    6 +++---\n builtin-describe.c           |    4 ++--\n builtin-diff-files.c         |    6 +++---\n builtin-diff-index.c         |    6 +++---\n builtin-diff-tree.c          |    6 +++---\n builtin-fast-export.c        |    8 ++++----\n builtin-fetch-pack.c         |    6 +++---\n builtin-fmt-merge-msg.c      |    6 +++---\n builtin-for-each-ref.c       |   10 +++++-----\n builtin-fsck.c               |    4 ++--\n builtin-grep.c               |    4 ++--\n builtin-init-db.c            |    6 +++---\n builtin-ls-files.c           |    4 ++--\n builtin-ls-remote.c          |    6 +++---\n builtin-ls-tree.c            |    8 ++++----\n builtin-mailinfo.c           |    8 ++++----\n builtin-mailsplit.c          |    6 +++---\n builtin-merge-base.c         |    6 +++---\n builtin-merge-file.c         |    6 +++---\n builtin-mktree.c             |    6 +++---\n builtin-name-rev.c           |    6 +++---\n builtin-pack-objects.c       |   18 +++++++++---------\n builtin-pack-refs.c          |    6 +++---\n builtin-prune-packed.c       |    4 ++--\n builtin-prune.c              |    4 ++--\n builtin-push.c               |    6 +++---\n builtin-read-tree.c          |    4 ++--\n builtin-receive-pack.c       |    8 ++++----\n builtin-reflog.c             |    4 ++--\n builtin-replace.c            |   16 ++++++++--------\n builtin-rerere.c             |    4 ++--\n builtin-reset.c              |    4 ++--\n builtin-rev-list.c           |    6 +++---\n builtin-rev-parse.c          |    2 +-\n builtin-revert.c             |    6 +++---\n builtin-send-pack.c          |    8 ++++----\n builtin-shortlog.c           |    8 ++++----\n builtin-show-branch.c        |    6 +++---\n builtin-show-ref.c           |    4 ++--\n builtin-symbolic-ref.c       |    6 +++---\n builtin-tag.c                |    8 ++++----\n builtin-tar-tree.c           |    4 ++--\n builtin-unpack-objects.c     |    7 ++++---\n builtin-update-index.c       |    4 ++--\n builtin-update-ref.c         |    8 ++++----\n builtin-update-server-info.c |    6 +++---\n builtin-upload-archive.c     |    5 ++---\n builtin-verify-pack.c        |    6 +++---\n builtin-verify-tag.c         |    6 +++---\n builtin-write-tree.c         |    4 ++--\n 60 files changed, 184 insertions(+), 182 deletions(-)\n\ndiff --git a/archive.c b/archive.c\nindex 73b8e8a..b74e69f 100644\n--- a/archive.c\n+++ b/archive.c\n@@ -6,7 +6,7 @@\n #include \"parse-options.h\"\n #include \"unpack-trees.h\"\n \n-static char const * const archive_usage[] = {\n+static const char * const archive_usage[] = {\n \t\"git archive [options] <tree-ish> [path...]\",\n \t\"git archive --list\",\n \t\"git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [path...]\",\ndiff --git a/builtin-apply.c b/builtin-apply.c\nindex c8372a0..b653831 100644\n--- a/builtin-apply.c\n+++ b/builtin-apply.c\n@@ -47,7 +47,7 @@ static int no_add;\n static const char *fake_ancestor;\n static int line_termination = '\\n';\n static unsigned int p_context = UINT_MAX;\n-static const char * const apply_usage[] = {\n+static const char * const builtin_apply_usage[] = {\n \t\"git apply [options] [<patch>...]\",\n \tNULL\n };\n@@ -3567,7 +3567,7 @@ int cmd_apply(int argc, const char **argv, const char *unused_prefix)\n \t\tparse_ignorewhitespace_option(apply_default_ignorewhitespace);\n \n \targc = parse_options(argc, argv, prefix, builtin_apply_options,\n-\t\t\tapply_usage, 0);\n+\t\t\tbuiltin_apply_usage, 0);\n \n \tif (apply_with_reject)\n \t\tapply = apply_verbosely = 1;\ndiff --git a/builtin-bisect--helper.c b/builtin-bisect--helper.c\nindex 5b22639..41aad99 100644\n--- a/builtin-bisect--helper.c\n+++ b/builtin-bisect--helper.c\n@@ -3,7 +3,7 @@\n #include \"parse-options.h\"\n #include \"bisect.h\"\n \n-static const char * const git_bisect_helper_usage[] = {\n+static const char * const builtin_bisect_helper_usage[] = {\n \t\"git bisect--helper --next-all\",\n \tNULL\n };\n@@ -18,10 +18,10 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix)\n \t};\n \n \targc = parse_options(argc, argv, prefix, options,\n-\t\t\t     git_bisect_helper_usage, 0);\n+\t\t\t     builtin_bisect_helper_usage, 0);\n \n \tif (!next_all)\n-\t\tusage_with_options(git_bisect_helper_usage, options);\n+\t\tusage_with_options(builtin_bisect_helper_usage, options);\n \n \t/* next-all */\n \treturn bisect_next_all(prefix);\ndiff --git a/builtin-blame.c b/builtin-blame.c\nindex 7512773..4adae84 100644\n--- a/builtin-blame.c\n+++ b/builtin-blame.c\n@@ -21,10 +21,11 @@\n #include \"parse-options.h\"\n #include \"utf8.h\"\n \n-static char blame_usage[] = \"git blame [options] [rev-opts] [rev] [--] file\";\n+static char builtin_blame_usage[] =\n+\"git blame [options] [rev-opts] [rev] [--] file\";\n \n static const char *blame_opt_usage[] = {\n-\tblame_usage,\n+\tbuiltin_blame_usage,\n \t\"\",\n \t\"[rev-opts] are documented in git-rev-list(1)\",\n \tNULL\n@@ -1948,10 +1949,10 @@ static void prepare_blame_range(struct scoreboard *sb,\n \tif (*term == ',') {\n \t\tterm = parse_loc(term + 1, sb, lno, *bottom + 1, top);\n \t\tif (*term)\n-\t\t\tusage(blame_usage);\n+\t\t\tusage(builtin_blame_usage);\n \t}\n \tif (*term)\n-\t\tusage(blame_usage);\n+\t\tusage(builtin_blame_usage);\n }\n \n static int git_blame_config(const char *var, const char *value, void *cb)\ndiff --git a/builtin-cat-file.c b/builtin-cat-file.c\nindex 5906842..c4d5c0e 100644\n--- a/builtin-cat-file.c\n+++ b/builtin-cat-file.c\n@@ -200,7 +200,7 @@ static int batch_objects(int print_contents)\n \treturn 0;\n }\n \n-static const char * const cat_file_usage[] = {\n+static const char * const builtin_cat_file_usage[] = {\n \t\"git cat-file (-t|-s|-e|-p|<type>) <object>\",\n \t\"git cat-file (--batch|--batch-check) < <list_of_objects>\",\n \tNULL\n@@ -229,25 +229,25 @@ int cmd_cat_file(int argc, const char **argv, const char *prefix)\n \tgit_config(git_default_config, NULL);\n \n \tif (argc != 3 && argc != 2)\n-\t\tusage_with_options(cat_file_usage, options);\n+\t\tusage_with_options(builtin_cat_file_usage, options);\n \n-\targc = parse_options(argc, argv, prefix, options, cat_file_usage, 0);\n+\targc = parse_options(argc, argv, prefix, options, builtin_cat_file_usage, 0);\n \n \tif (opt) {\n \t\tif (argc == 1)\n \t\t\tobj_name = argv[0];\n \t\telse\n-\t\t\tusage_with_options(cat_file_usage, options);\n+\t\t\tusage_with_options(builtin_cat_file_usage, options);\n \t}\n \tif (!opt && !batch) {\n \t\tif (argc == 2) {\n \t\t\texp_type = argv[0];\n \t\t\tobj_name = argv[1];\n \t\t} else\n-\t\t\tusage_with_options(cat_file_usage, options);\n+\t\t\tusage_with_options(builtin_cat_file_usage, options);\n \t}\n \tif (batch && (opt || argc)) {\n-\t\tusage_with_options(cat_file_usage, options);\n+\t\tusage_with_options(builtin_cat_file_usage, options);\n \t}\n \n \tif (batch)\ndiff --git a/builtin-check-attr.c b/builtin-check-attr.c\nindex 8bd0430..3ccce59 100644\n--- a/builtin-check-attr.c\n+++ b/builtin-check-attr.c\n@@ -5,7 +5,7 @@\n #include \"parse-options.h\"\n \n static int stdin_paths;\n-static const char * const check_attr_usage[] = {\n+static const char * const builtin_check_attr_usage[] = {\n \"git check-attr attr... [--] pathname...\",\n \"git check-attr --stdin attr... < <list-of-paths>\",\n NULL\n@@ -70,9 +70,9 @@ int cmd_check_attr(int argc, const char **argv, const char *prefix)\n \tconst char *errstr = NULL;\n \n \targc = parse_options(argc, argv, prefix, check_attr_options,\n-\t\t\t     check_attr_usage, PARSE_OPT_KEEP_DASHDASH);\n+\t\t\t     builtin_check_attr_usage, PARSE_OPT_KEEP_DASHDASH);\n \tif (!argc)\n-\t\tusage_with_options(check_attr_usage, check_attr_options);\n+\t\tusage_with_options(builtin_check_attr_usage, check_attr_options);\n \n \tif (read_cache() < 0) {\n \t\tdie(\"invalid cache\");\n@@ -98,7 +98,7 @@ int cmd_check_attr(int argc, const char **argv, const char *prefix)\n \t\terrstr = \"Can't specify files with --stdin\";\n \tif (errstr) {\n \t\terror(\"%s\", errstr);\n-\t\tusage_with_options(check_attr_usage, check_attr_options);\n+\t\tusage_with_options(builtin_check_attr_usage, check_attr_options);\n \t}\n \n \tcheck = xcalloc(cnt, sizeof(*check));\ndiff --git a/builtin-checkout.c b/builtin-checkout.c\nindex d050c37..91d6c5e 100644\n--- a/builtin-checkout.c\n+++ b/builtin-checkout.c\n@@ -18,7 +18,7 @@\n #include \"xdiff-interface.h\"\n #include \"ll-merge.h\"\n \n-static const char * const checkout_usage[] = {\n+static const char * const builtin_checkout_usage[] = {\n \t\"git checkout [options] <branch>\",\n \t\"git checkout [options] [<branch>] -- <file>...\",\n \tNULL,\n@@ -608,7 +608,7 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)\n \n \topts.track = BRANCH_TRACK_UNSPECIFIED;\n \n-\targc = parse_options(argc, argv, prefix, options, checkout_usage,\n+\targc = parse_options(argc, argv, prefix, options, builtin_checkout_usage,\n \t\t\t     PARSE_OPT_KEEP_DASHDASH);\n \n \tif (patch_mode && (opts.track > 0 || opts.new_branch\ndiff --git a/builtin-clean.c b/builtin-clean.c\nindex 28cdcd0..562f186 100644\n--- a/builtin-clean.c\n+++ b/builtin-clean.c\n@@ -14,7 +14,7 @@\n \n static int force = -1; /* unset */\n \n-static const char *const builtin_clean_usage[] = {\n+static const char * const builtin_clean_usage[] = {\n \t\"git clean [-d] [-f] [-n] [-q] [-x | -X] [--] <paths>...\",\n \tNULL\n };\ndiff --git a/builtin-commit-tree.c b/builtin-commit-tree.c\nindex 6467077..2bf4200 100644\n--- a/builtin-commit-tree.c\n+++ b/builtin-commit-tree.c\n@@ -24,7 +24,8 @@ static void check_valid(unsigned char *sha1, enum object_type expect)\n \t\t    typename(expect));\n }\n \n-static const char commit_tree_usage[] = \"git commit-tree <sha1> [-p <sha1>]* < changelog\";\n+static const char builtin_commit_tree_usage[] =\n+\"git commit-tree <sha1> [-p <sha1>]* < changelog\";\n \n static void new_parent(struct commit *parent, struct commit_list **parents_p)\n {\n@@ -106,7 +107,7 @@ int cmd_commit_tree(int argc, const char **argv, const char *prefix)\n \tgit_config(git_default_config, NULL);\n \n \tif (argc < 2)\n-\t\tusage(commit_tree_usage);\n+\t\tusage(builtin_commit_tree_usage);\n \tif (get_sha1(argv[1], tree_sha1))\n \t\tdie(\"Not a valid object name %s\", argv[1]);\n \n@@ -115,7 +116,7 @@ int cmd_commit_tree(int argc, const char **argv, const char *prefix)\n \t\tconst char *a, *b;\n \t\ta = argv[i]; b = argv[i+1];\n \t\tif (!b || strcmp(a, \"-p\"))\n-\t\t\tusage(commit_tree_usage);\n+\t\t\tusage(builtin_commit_tree_usage);\n \n \t\tif (get_sha1(b, sha1))\n \t\t\tdie(\"Not a valid object name %s\", b);\ndiff --git a/builtin-config.c b/builtin-config.c\nindex a2d656e..8db1c4b 100644\n--- a/builtin-config.c\n+++ b/builtin-config.c\n@@ -3,7 +3,7 @@\n #include \"color.h\"\n #include \"parse-options.h\"\n \n-static const char *const builtin_config_usage[] = {\n+static const char * const builtin_config_usage[] = {\n \t\"git config [options]\",\n \tNULL\n };\ndiff --git a/builtin-count-objects.c b/builtin-count-objects.c\nindex 1b0b6c8..fbe0972 100644\n--- a/builtin-count-objects.c\n+++ b/builtin-count-objects.c\n@@ -65,7 +65,7 @@ static void count_objects(DIR *d, char *path, int len, int verbose,\n \t}\n }\n \n-static char const * const count_objects_usage[] = {\n+static char const * const builtin_count_objects_usage[] = {\n \t\"git count-objects [-v]\",\n \tNULL\n };\n@@ -83,10 +83,10 @@ int cmd_count_objects(int argc, const char **argv, const char *prefix)\n \t\tOPT_END(),\n \t};\n \n-\targc = parse_options(argc, argv, prefix, opts, count_objects_usage, 0);\n+\targc = parse_options(argc, argv, prefix, opts, builtin_count_objects_usage, 0);\n \t/* we do not take arguments other than flags for now */\n \tif (argc)\n-\t\tusage_with_options(count_objects_usage, opts);\n+\t\tusage_with_options(builtin_count_objects_usage, opts);\n \tmemcpy(path, objdir, len);\n \tif (len && objdir[len-1] != '/')\n \t\tpath[len++] = '/';\ndiff --git a/builtin-describe.c b/builtin-describe.c\nindex df67a73..46fd6fa 100644\n--- a/builtin-describe.c\n+++ b/builtin-describe.c\n@@ -9,7 +9,7 @@\n #define SEEN\t\t(1u<<0)\n #define MAX_TAGS\t(FLAG_BITS - 1)\n \n-static const char * const describe_usage[] = {\n+static const char * const builtin_describe_usage[] = {\n \t\"git describe [options] <committish>*\",\n \tNULL\n };\n@@ -327,7 +327,7 @@ int cmd_describe(int argc, const char **argv, const char *prefix)\n \t\tOPT_END(),\n \t};\n \n-\targc = parse_options(argc, argv, prefix, options, describe_usage, 0);\n+\targc = parse_options(argc, argv, prefix, options, builtin_describe_usage, 0);\n \tif (max_candidates < 0)\n \t\tmax_candidates = 0;\n \telse if (max_candidates > MAX_TAGS)\ndiff --git a/builtin-diff-files.c b/builtin-diff-files.c\nindex 5b64011..edd6127 100644\n--- a/builtin-diff-files.c\n+++ b/builtin-diff-files.c\n@@ -9,7 +9,7 @@\n #include \"revision.h\"\n #include \"builtin.h\"\n \n-static const char diff_files_usage[] =\n+static const char builtin_diff_files_usage[] =\n \"git diff-files [-q] [-0/-1/2/3 |-c|--cc] [<common diff options>] [<path>...]\"\n COMMON_DIFF_OPTIONS_HELP;\n \n@@ -34,7 +34,7 @@ int cmd_diff_files(int argc, const char **argv, const char *prefix)\n \t\telse if (!strcmp(argv[1], \"-q\"))\n \t\t\toptions |= DIFF_SILENT_ON_REMOVED;\n \t\telse\n-\t\t\tusage(diff_files_usage);\n+\t\t\tusage(builtin_diff_files_usage);\n \t\targv++; argc--;\n \t}\n \tif (!rev.diffopt.output_format)\n@@ -48,7 +48,7 @@ int cmd_diff_files(int argc, const char **argv, const char *prefix)\n \tif (rev.pending.nr ||\n \t    rev.min_age != -1 || rev.max_age != -1 ||\n \t    3 < rev.max_count)\n-\t\tusage(diff_files_usage);\n+\t\tusage(builtin_diff_files_usage);\n \n \t/*\n \t * \"diff-files --base -p\" should not combine merges because it\ndiff --git a/builtin-diff-index.c b/builtin-diff-index.c\nindex 0483749..dbbbb9a 100644\n--- a/builtin-diff-index.c\n+++ b/builtin-diff-index.c\n@@ -4,7 +4,7 @@\n #include \"revision.h\"\n #include \"builtin.h\"\n \n-static const char diff_cache_usage[] =\n+static const char builtin_diff_index_usage[] =\n \"git diff-index [-m] [--cached] \"\n \"[<common diff options>] <tree-ish> [<path>...]\"\n COMMON_DIFF_OPTIONS_HELP;\n@@ -27,7 +27,7 @@ int cmd_diff_index(int argc, const char **argv, const char *prefix)\n \t\tif (!strcmp(arg, \"--cached\"))\n \t\t\tcached = 1;\n \t\telse\n-\t\t\tusage(diff_cache_usage);\n+\t\t\tusage(builtin_diff_index_usage);\n \t}\n \tif (!rev.diffopt.output_format)\n \t\trev.diffopt.output_format = DIFF_FORMAT_RAW;\n@@ -38,7 +38,7 @@ int cmd_diff_index(int argc, const char **argv, const char *prefix)\n \t */\n \tif (rev.pending.nr != 1 ||\n \t    rev.max_count != -1 || rev.min_age != -1 || rev.max_age != -1)\n-\t\tusage(diff_cache_usage);\n+\t\tusage(builtin_diff_index_usage);\n \tif (!cached)\n \t\tsetup_work_tree();\n \tif (read_cache() < 0) {\ndiff --git a/builtin-diff-tree.c b/builtin-diff-tree.c\nindex 79cedb7..394ed35 100644\n--- a/builtin-diff-tree.c\n+++ b/builtin-diff-tree.c\n@@ -85,7 +85,7 @@ static int diff_tree_stdin(char *line)\n \treturn -1;\n }\n \n-static const char diff_tree_usage[] =\n+static const char builtin_diff_tree_usage[] =\n \"git diff-tree [--stdin] [-m] [-c] [--cc] [-s] [-v] [--pretty] [-t] [-r] [--root] \"\n \"[<common diff options>] <tree-ish> [<tree-ish>] [<path>...]\\n\"\n \"  -r            diff recursively\\n\"\n@@ -113,7 +113,7 @@ int cmd_diff_tree(int argc, const char **argv, const char *prefix)\n \t\t\tread_stdin = 1;\n \t\t\tcontinue;\n \t\t}\n-\t\tusage(diff_tree_usage);\n+\t\tusage(builtin_diff_tree_usage);\n \t}\n \n \tif (!opt->diffopt.output_format)\n@@ -128,7 +128,7 @@ int cmd_diff_tree(int argc, const char **argv, const char *prefix)\n \tswitch (nr_sha1) {\n \tcase 0:\n \t\tif (!read_stdin)\n-\t\t\tusage(diff_tree_usage);\n+\t\t\tusage(builtin_diff_tree_usage);\n \t\tbreak;\n \tcase 1:\n \t\ttree1 = opt->pending.objects[0].item;\ndiff --git a/builtin-fast-export.c b/builtin-fast-export.c\nindex b0a4029..a4a86ba 100644\n--- a/builtin-fast-export.c\n+++ b/builtin-fast-export.c\n@@ -17,7 +17,7 @@\n #include \"utf8.h\"\n #include \"parse-options.h\"\n \n-static const char *fast_export_usage[] = {\n+static const char * const builtin_fast_export_usage[] = {\n \t\"git fast-export [rev-list-opts]\",\n \tNULL\n };\n@@ -591,7 +591,7 @@ int cmd_fast_export(int argc, const char **argv, const char *prefix)\n \t};\n \n \tif (argc == 1)\n-\t\tusage_with_options (fast_export_usage, options);\n+\t\tusage_with_options(builtin_fast_export_usage, options);\n \n \t/* we handle encodings */\n \tgit_config(git_default_config, NULL);\n@@ -601,9 +601,9 @@ int cmd_fast_export(int argc, const char **argv, const char *prefix)\n \trevs.show_source = 1;\n \trevs.rewrite_parents = 1;\n \targc = setup_revisions(argc, argv, &revs, NULL);\n-\targc = parse_options(argc, argv, prefix, options, fast_export_usage, 0);\n+\targc = parse_options(argc, argv, prefix, options, builtin_fast_export_usage, 0);\n \tif (argc > 1)\n-\t\tusage_with_options (fast_export_usage, options);\n+\t\tusage_with_options(builtin_fast_export_usage, options);\n \n \tif (import_filename)\n \t\timport_marks(import_filename);\ndiff --git a/builtin-fetch-pack.c b/builtin-fetch-pack.c\nindex 629735f..d291c19 100644\n--- a/builtin-fetch-pack.c\n+++ b/builtin-fetch-pack.c\n@@ -18,7 +18,7 @@ static struct fetch_pack_args args = {\n \t/* .uploadpack = */ \"git-upload-pack\",\n };\n \n-static const char fetch_pack_usage[] =\n+static const char builtin_fetch_pack_usage[] =\n \"git fetch-pack [--all] [--quiet|-q] [--keep|-k] [--thin] [--include-tag] [--upload-pack=<git-upload-pack>] [--depth=<n>] [--no-progress] [-v] [<host>:]<directory> [<refs>...]\";\n \n #define COMPLETE\t(1U << 0)\n@@ -734,7 +734,7 @@ int cmd_fetch_pack(int argc, const char **argv, const char *prefix)\n \t\t\t\targs.no_progress = 1;\n \t\t\t\tcontinue;\n \t\t\t}\n-\t\t\tusage(fetch_pack_usage);\n+\t\t\tusage(builtin_fetch_pack_usage);\n \t\t}\n \t\tdest = (char *)arg;\n \t\theads = (char **)(argv + i + 1);\n@@ -742,7 +742,7 @@ int cmd_fetch_pack(int argc, const char **argv, const char *prefix)\n \t\tbreak;\n \t}\n \tif (!dest)\n-\t\tusage(fetch_pack_usage);\n+\t\tusage(builtin_fetch_pack_usage);\n \n \tconn = git_connect(fd, (char *)dest, args.uploadpack,\n \t\t\t   args.verbose ? CONNECT_VERBOSE : 0);\ndiff --git a/builtin-fmt-merge-msg.c b/builtin-fmt-merge-msg.c\nindex 9d52400..0e05038 100644\n--- a/builtin-fmt-merge-msg.c\n+++ b/builtin-fmt-merge-msg.c\n@@ -5,7 +5,7 @@\n #include \"revision.h\"\n #include \"tag.h\"\n \n-static const char * const fmt_merge_msg_usage[] = {\n+static const char * const builtin_fmt_merge_msg_usage[] = {\n \t\"git fmt-merge-msg [--log|--no-log] [--file <file>]\",\n \tNULL\n };\n@@ -360,10 +360,10 @@ int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix)\n \tint ret;\n \n \tgit_config(fmt_merge_msg_config, NULL);\n-\targc = parse_options(argc, argv, prefix, options, fmt_merge_msg_usage,\n+\targc = parse_options(argc, argv, prefix, options, builtin_fmt_merge_msg_usage,\n \t\t\t     0);\n \tif (argc > 0)\n-\t\tusage_with_options(fmt_merge_msg_usage, options);\n+\t\tusage_with_options(builtin_fmt_merge_msg_usage, options);\n \n \tif (inpath && strcmp(inpath, \"-\")) {\n \t\tin = fopen(inpath, \"r\");\ndiff --git a/builtin-for-each-ref.c b/builtin-for-each-ref.c\nindex a5a83f1..715d378 100644\n--- a/builtin-for-each-ref.c\n+++ b/builtin-for-each-ref.c\n@@ -881,7 +881,7 @@ static int opt_parse_sort(const struct option *opt, const char *arg, int unset)\n \treturn 0;\n }\n \n-static char const * const for_each_ref_usage[] = {\n+static char const * const builtin_for_each_ref_usage[] = {\n \t\"git for-each-ref [options] [<pattern>]\",\n \tNULL\n };\n@@ -913,17 +913,17 @@ int cmd_for_each_ref(int argc, const char **argv, const char *prefix)\n \t\tOPT_END(),\n \t};\n \n-\tparse_options(argc, argv, prefix, opts, for_each_ref_usage, 0);\n+\tparse_options(argc, argv, prefix, opts, builtin_for_each_ref_usage, 0);\n \tif (maxcount < 0) {\n \t\terror(\"invalid --count argument: `%d'\", maxcount);\n-\t\tusage_with_options(for_each_ref_usage, opts);\n+\t\tusage_with_options(builtin_for_each_ref_usage, opts);\n \t}\n \tif (HAS_MULTI_BITS(quote_style)) {\n \t\terror(\"more than one quoting style?\");\n-\t\tusage_with_options(for_each_ref_usage, opts);\n+\t\tusage_with_options(builtin_for_each_ref_usage, opts);\n \t}\n \tif (verify_format(format))\n-\t\tusage_with_options(for_each_ref_usage, opts);\n+\t\tusage_with_options(builtin_for_each_ref_usage, opts);\n \n \tif (!sort)\n \t\tsort = default_sort();\ndiff --git a/builtin-fsck.c b/builtin-fsck.c\nindex c58b0e3..0857357 100644\n--- a/builtin-fsck.c\n+++ b/builtin-fsck.c\n@@ -564,7 +564,7 @@ static int fsck_cache_tree(struct cache_tree *it)\n \treturn err;\n }\n \n-static char const * const fsck_usage[] = {\n+static char const * const builtin_fsck_usage[] = {\n \t\"git fsck [options] [<object>...]\",\n \tNULL\n };\n@@ -591,7 +591,7 @@ int cmd_fsck(int argc, const char **argv, const char *prefix)\n \terrors_found = 0;\n \tread_replace_refs = 0;\n \n-\targc = parse_options(argc, argv, prefix, fsck_opts, fsck_usage, 0);\n+\targc = parse_options(argc, argv, prefix, fsck_opts, builtin_fsck_usage, 0);\n \tif (write_lost_and_found) {\n \t\tcheck_full = 1;\n \t\tinclude_reflogs = 0;\ndiff --git a/builtin-grep.c b/builtin-grep.c\nindex 761799d..8eb7534 100644\n--- a/builtin-grep.c\n+++ b/builtin-grep.c\n@@ -23,7 +23,7 @@\n #endif\n #endif\n \n-static char const * const grep_usage[] = {\n+static const char * const builtin_grep_usage[] = {\n \t\"git grep [options] [-e] <pattern> [<rev>...] [[--] path...]\",\n \tNULL\n };\n@@ -813,7 +813,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix)\n \t * unrecognized non option is the beginning of the refs list\n \t * that continues up to the -- (if exists), and then paths.\n \t */\n-\targc = parse_options(argc, argv, prefix, options, grep_usage,\n+\targc = parse_options(argc, argv, prefix, options, builtin_grep_usage,\n \t\t\t     PARSE_OPT_KEEP_DASHDASH |\n \t\t\t     PARSE_OPT_STOP_AT_NON_OPTION |\n \t\t\t     PARSE_OPT_NO_INTERNAL_HELP);\ndiff --git a/builtin-init-db.c b/builtin-init-db.c\nindex dd84cae..bf067a9 100644\n--- a/builtin-init-db.c\n+++ b/builtin-init-db.c\n@@ -377,7 +377,7 @@ static int shared_callback(const struct option *opt, const char *arg, int unset)\n \treturn 0;\n }\n \n-static const char *const init_db_usage[] = {\n+static const char * const builtin_init_db_usage[] = {\n \t\"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--shared[=<permissions>]] [directory]\",\n \tNULL\n };\n@@ -406,7 +406,7 @@ int cmd_init_db(int argc, const char **argv, const char *prefix)\n \t\tOPT_END()\n \t};\n \n-\targc = parse_options(argc, argv, prefix, init_db_options, init_db_usage, 0);\n+\targc = parse_options(argc, argv, prefix, init_db_options, builtin_init_db_usage, 0);\n \n \tif (argc == 1) {\n \t\tint mkdir_tried = 0;\n@@ -440,7 +440,7 @@ int cmd_init_db(int argc, const char **argv, const char *prefix)\n \t\t\tdie_errno(\"cannot chdir to %s\", argv[0]);\n \t\t}\n \t} else if (0 < argc) {\n-\t\tusage(init_db_usage[0]);\n+\t\tusage(builtin_init_db_usage[0]);\n \t}\n \tif (is_bare_repository_cfg == 1) {\n \t\tstatic char git_dir[PATH_MAX+1];\ndiff --git a/builtin-ls-files.c b/builtin-ls-files.c\nindex f473220..a41356a 100644\n--- a/builtin-ls-files.c\n+++ b/builtin-ls-files.c\n@@ -373,7 +373,7 @@ int report_path_error(const char *ps_matched, const char **pathspec, int prefix_\n \treturn errors;\n }\n \n-static const char * const ls_files_usage[] = {\n+static const char * const builtin_ls_files_usage[] = {\n \t\"git ls-files [options] [<file>]*\",\n \tNULL\n };\n@@ -482,7 +482,7 @@ int cmd_ls_files(int argc, const char **argv, const char *prefix)\n \tgit_config(git_default_config, NULL);\n \n \targc = parse_options(argc, argv, prefix, builtin_ls_files_options,\n-\t\t\tls_files_usage, 0);\n+\t\t\tbuiltin_ls_files_usage, 0);\n \tif (show_tag || show_valid_bit) {\n \t\ttag_cached = \"H \";\n \t\ttag_unmerged = \"M \";\ndiff --git a/builtin-ls-remote.c b/builtin-ls-remote.c\nindex 78a88f7..f35d50f 100644\n--- a/builtin-ls-remote.c\n+++ b/builtin-ls-remote.c\n@@ -3,7 +3,7 @@\n #include \"transport.h\"\n #include \"remote.h\"\n \n-static const char ls_remote_usage[] =\n+static const char builtin_ls_remote_usage[] =\n \"git ls-remote [--heads] [--tags]  [-u <exec> | --upload-pack <exec>] <repository> <refs>...\";\n \n /*\n@@ -66,7 +66,7 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix)\n \t\t\t\tflags |= REF_NORMAL;\n \t\t\t\tcontinue;\n \t\t\t}\n-\t\t\tusage(ls_remote_usage);\n+\t\t\tusage(builtin_ls_remote_usage);\n \t\t}\n \t\tdest = arg;\n \t\ti++;\n@@ -74,7 +74,7 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix)\n \t}\n \n \tif (!dest)\n-\t\tusage(ls_remote_usage);\n+\t\tusage(builtin_ls_remote_usage);\n \n \tif (argv[i]) {\n \t\tint j;\ndiff --git a/builtin-ls-tree.c b/builtin-ls-tree.c\nindex 22008df..a01eb5e 100644\n--- a/builtin-ls-tree.c\n+++ b/builtin-ls-tree.c\n@@ -22,8 +22,8 @@ static const char **pathspec;\n static int chomp_prefix;\n static const char *ls_tree_prefix;\n \n-static const char ls_tree_usage[] =\n-\t\"git ls-tree [-d] [-r] [-t] [-l] [-z] [--name-only] [--name-status] [--full-name] [--full-tree] [--abbrev[=<n>]] <tree-ish> [path...]\";\n+static const char builtin_ls_tree_usage[] =\n+\"git ls-tree [-d] [-r] [-t] [-l] [-z] [--name-only] [--name-status] [--full-name] [--full-tree] [--abbrev[=<n>]] <tree-ish> [path...]\";\n \n static int show_recursive(const char *base, int baselen, const char *pathname)\n {\n@@ -172,7 +172,7 @@ int cmd_ls_tree(int argc, const char **argv, const char *prefix)\n \t\t\t}\n \t\t\t/* otherwise fallthru */\n \t\tdefault:\n-\t\t\tusage(ls_tree_usage);\n+\t\t\tusage(builtin_ls_tree_usage);\n \t\t}\n \t\targc--; argv++;\n \t}\n@@ -182,7 +182,7 @@ int cmd_ls_tree(int argc, const char **argv, const char *prefix)\n \t\tls_options |= LS_SHOW_TREES;\n \n \tif (argc < 2)\n-\t\tusage(ls_tree_usage);\n+\t\tusage(builtin_ls_tree_usage);\n \tif (get_sha1(argv[1], sha1))\n \t\tdie(\"Not a valid object name %s\", argv[1]);\n \ndiff --git a/builtin-mailinfo.c b/builtin-mailinfo.c\nindex d498b1c..26c9608 100644\n--- a/builtin-mailinfo.c\n+++ b/builtin-mailinfo.c\n@@ -1003,8 +1003,8 @@ static int git_mailinfo_config(const char *var, const char *value, void *unused)\n \treturn 0;\n }\n \n-static const char mailinfo_usage[] =\n-\t\"git mailinfo [-k] [-u | --encoding=<encoding> | -n] [--scissors | --no-scissors] msg patch < mail >info\";\n+static const char builtin_mailinfo_usage[] =\n+\"git mailinfo [-k] [-u | --encoding=<encoding> | -n] [--scissors | --no-scissors] msg patch < mail >info\";\n \n int cmd_mailinfo(int argc, const char **argv, const char *prefix)\n {\n@@ -1032,12 +1032,12 @@ int cmd_mailinfo(int argc, const char **argv, const char *prefix)\n \t\telse if (!strcmp(argv[1], \"--no-scissors\"))\n \t\t\tuse_scissors = 0;\n \t\telse\n-\t\t\tusage(mailinfo_usage);\n+\t\t\tusage(builtin_mailinfo_usage);\n \t\targc--; argv++;\n \t}\n \n \tif (argc != 3)\n-\t\tusage(mailinfo_usage);\n+\t\tusage(builtin_mailinfo_usage);\n \n \treturn !!mailinfo(stdin, stdout, argv[1], argv[2]);\n }\ndiff --git a/builtin-mailsplit.c b/builtin-mailsplit.c\nindex dfe5b15..ccb26ba 100644\n--- a/builtin-mailsplit.c\n+++ b/builtin-mailsplit.c\n@@ -9,7 +9,7 @@\n #include \"string-list.h\"\n #include \"strbuf.h\"\n \n-static const char git_mailsplit_usage[] =\n+static const char builtin_mailsplit_usage[] =\n \"git mailsplit [-d<prec>] [-f<n>] [-b] -o<directory> [<mbox>|<Maildir>...]\";\n \n static int is_from_line(const char *line, int len)\n@@ -227,7 +227,7 @@ int cmd_mailsplit(int argc, const char **argv, const char *prefix)\n \t\tif ( arg[1] == 'd' ) {\n \t\t\tnr_prec = strtol(arg+2, NULL, 10);\n \t\t\tif (nr_prec < 3 || 10 <= nr_prec)\n-\t\t\t\tusage(git_mailsplit_usage);\n+\t\t\t\tusage(builtin_mailsplit_usage);\n \t\t\tcontinue;\n \t\t} else if ( arg[1] == 'f' ) {\n \t\t\tnr = strtol(arg+2, NULL, 10);\n@@ -259,7 +259,7 @@ int cmd_mailsplit(int argc, const char **argv, const char *prefix)\n \t\t\targp = stdin_only;\n \t\t\tbreak;\n \t\tdefault:\n-\t\t\tusage(git_mailsplit_usage);\n+\t\t\tusage(builtin_mailsplit_usage);\n \t\t}\n \t} else {\n \t\t/* New usage: if no more argument, parse stdin */\ndiff --git a/builtin-merge-base.c b/builtin-merge-base.c\nindex 54e7ec2..99da43f 100644\n--- a/builtin-merge-base.c\n+++ b/builtin-merge-base.c\n@@ -22,7 +22,7 @@ static int show_merge_base(struct commit **rev, int rev_nr, int show_all)\n \treturn 0;\n }\n \n-static const char * const merge_base_usage[] = {\n+static const char * const builtin_merge_base_usage[] = {\n \t\"git merge-base [-a|--all] <commit> <commit>...\",\n \tNULL\n };\n@@ -53,9 +53,9 @@ int cmd_merge_base(int argc, const char **argv, const char *prefix)\n \t};\n \n \tgit_config(git_default_config, NULL);\n-\targc = parse_options(argc, argv, prefix, options, merge_base_usage, 0);\n+\targc = parse_options(argc, argv, prefix, options, builtin_merge_base_usage, 0);\n \tif (argc < 2)\n-\t\tusage_with_options(merge_base_usage, options);\n+\t\tusage_with_options(builtin_merge_base_usage, options);\n \trev = xmalloc(argc * sizeof(*rev));\n \twhile (argc-- > 0)\n \t\trev[rev_nr++] = get_commit_reference(*argv++);\ndiff --git a/builtin-merge-file.c b/builtin-merge-file.c\nindex afd2ea7..42bd479 100644\n--- a/builtin-merge-file.c\n+++ b/builtin-merge-file.c\n@@ -4,7 +4,7 @@\n #include \"xdiff-interface.h\"\n #include \"parse-options.h\"\n \n-static const char *const merge_file_usage[] = {\n+static const char * const builtin_merge_file_usage[] = {\n \t\"git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file file2\",\n \tNULL\n };\n@@ -48,9 +48,9 @@ int cmd_merge_file(int argc, const char **argv, const char *prefix)\n \t\t\tmerge_style = git_xmerge_style;\n \t}\n \n-\targc = parse_options(argc, argv, prefix, options, merge_file_usage, 0);\n+\targc = parse_options(argc, argv, prefix, options, builtin_merge_file_usage, 0);\n \tif (argc != 3)\n-\t\tusage_with_options(merge_file_usage, options);\n+\t\tusage_with_options(builtin_merge_file_usage, options);\n \tif (quiet) {\n \t\tif (!freopen(\"/dev/null\", \"w\", stderr))\n \t\t\treturn error(\"failed to redirect stderr to /dev/null: \"\ndiff --git a/builtin-mktree.c b/builtin-mktree.c\nindex 098395f..7242a4c 100644\n--- a/builtin-mktree.c\n+++ b/builtin-mktree.c\n@@ -62,7 +62,7 @@ static void write_tree(unsigned char *sha1)\n \twrite_sha1_file(buf.buf, buf.len, tree_type, sha1);\n }\n \n-static const char *mktree_usage[] = {\n+static const char * const builtin_mktree_usage[] = {\n \t\"git mktree [-z] [--missing] [--batch]\",\n \tNULL\n };\n@@ -139,7 +139,7 @@ static void mktree_line(char *buf, size_t len, int line_termination, int allow_m\n \tappend_to_tree(mode, sha1, path);\n }\n \n-int cmd_mktree(int ac, const char **av, const char *prefix)\n+int cmd_mktree(int argc, const char **argv, const char *prefix)\n {\n \tstruct strbuf sb = STRBUF_INIT;\n \tunsigned char sha1[20];\n@@ -155,7 +155,7 @@ int cmd_mktree(int ac, const char **av, const char *prefix)\n \t\tOPT_END()\n \t};\n \n-\tac = parse_options(ac, av, prefix, option, mktree_usage, 0);\n+\targc = parse_options(argc, argv, prefix, option, builtin_mktree_usage, 0);\n \n \twhile (!got_eof) {\n \t\twhile (1) {\ndiff --git a/builtin-name-rev.c b/builtin-name-rev.c\nindex 06a38ac..d8913e3 100644\n--- a/builtin-name-rev.c\n+++ b/builtin-name-rev.c\n@@ -171,7 +171,7 @@ static void show_name(const struct object *obj,\n \t\tdie(\"cannot describe '%s'\", sha1_to_hex(sha1));\n }\n \n-static char const * const name_rev_usage[] = {\n+static const char * const builtin_name_rev_usage[] = {\n \t\"git name-rev [options] ( --all | --stdin | <commit>... )\",\n \tNULL\n };\n@@ -238,10 +238,10 @@ int cmd_name_rev(int argc, const char **argv, const char *prefix)\n \t};\n \n \tgit_config(git_default_config, NULL);\n-\targc = parse_options(argc, argv, prefix, opts, name_rev_usage, 0);\n+\targc = parse_options(argc, argv, prefix, opts, builtin_name_rev_usage, 0);\n \tif (!!all + !!transform_stdin + !!argc > 1) {\n \t\terror(\"Specify either a list, or --all, not both!\");\n-\t\tusage_with_options(name_rev_usage, opts);\n+\t\tusage_with_options(builtin_name_rev_usage, opts);\n \t}\n \tif (all || transform_stdin)\n \t\tcutoff = 0;\ndiff --git a/builtin-pack-objects.c b/builtin-pack-objects.c\nindex 02f9246..a778246 100644\n--- a/builtin-pack-objects.c\n+++ b/builtin-pack-objects.c\n@@ -22,7 +22,7 @@\n #include <pthread.h>\n #endif\n \n-static const char pack_usage[] =\n+static const char builtin_pack_objects_usage[] =\n   \"git pack-objects [{ -q | --progress | --all-progress }]\\n\"\n   \"        [--max-pack-size=N] [--local] [--incremental]\\n\"\n   \"        [--window=N] [--window-memory=N] [--depth=N]\\n\"\n@@ -2166,7 +2166,7 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)\n \t\t\tchar *end;\n \t\t\tint level = strtoul(arg+14, &end, 0);\n \t\t\tif (!arg[14] || *end)\n-\t\t\t\tusage(pack_usage);\n+\t\t\t\tusage(builtin_pack_objects_usage);\n \t\t\tif (level == -1)\n \t\t\t\tlevel = Z_DEFAULT_COMPRESSION;\n \t\t\telse if (level < 0 || level > Z_BEST_COMPRESSION)\n@@ -2179,26 +2179,26 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)\n \t\t\tpack_size_limit_cfg = 0;\n \t\t\tpack_size_limit = strtoul(arg+16, &end, 0) * 1024 * 1024;\n \t\t\tif (!arg[16] || *end)\n-\t\t\t\tusage(pack_usage);\n+\t\t\t\tusage(builtin_pack_objects_usage);\n \t\t\tcontinue;\n \t\t}\n \t\tif (!prefixcmp(arg, \"--window=\")) {\n \t\t\tchar *end;\n \t\t\twindow = strtoul(arg+9, &end, 0);\n \t\t\tif (!arg[9] || *end)\n-\t\t\t\tusage(pack_usage);\n+\t\t\t\tusage(builtin_pack_objects_usage);\n \t\t\tcontinue;\n \t\t}\n \t\tif (!prefixcmp(arg, \"--window-memory=\")) {\n \t\t\tif (!git_parse_ulong(arg+16, &window_memory_limit))\n-\t\t\t\tusage(pack_usage);\n+\t\t\t\tusage(builtin_pack_objects_usage);\n \t\t\tcontinue;\n \t\t}\n \t\tif (!prefixcmp(arg, \"--threads=\")) {\n \t\t\tchar *end;\n \t\t\tdelta_search_threads = strtoul(arg+10, &end, 0);\n \t\t\tif (!arg[10] || *end || delta_search_threads < 0)\n-\t\t\t\tusage(pack_usage);\n+\t\t\t\tusage(builtin_pack_objects_usage);\n #ifndef THREADED_DELTA_SEARCH\n \t\t\tif (delta_search_threads != 1)\n \t\t\t\twarning(\"no threads support, \"\n@@ -2210,7 +2210,7 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)\n \t\t\tchar *end;\n \t\t\tdepth = strtoul(arg+8, &end, 0);\n \t\t\tif (!arg[8] || *end)\n-\t\t\t\tusage(pack_usage);\n+\t\t\t\tusage(builtin_pack_objects_usage);\n \t\t\tcontinue;\n \t\t}\n \t\tif (!strcmp(\"--progress\", arg)) {\n@@ -2290,7 +2290,7 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)\n \t\t\tgrafts_replace_parents = 0;\n \t\t\tcontinue;\n \t\t}\n-\t\tusage(pack_usage);\n+\t\tusage(builtin_pack_objects_usage);\n \t}\n \n \t/* Traditionally \"pack-objects [options] base extra\" failed;\n@@ -2310,7 +2310,7 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)\n \t\tbase_name = argv[i++];\n \n \tif (pack_to_stdout != !base_name)\n-\t\tusage(pack_usage);\n+\t\tusage(builtin_pack_objects_usage);\n \n \tif (!pack_to_stdout && !pack_size_limit)\n \t\tpack_size_limit = pack_size_limit_cfg;\ndiff --git a/builtin-pack-refs.c b/builtin-pack-refs.c\nindex 091860b..3ec3c2f 100644\n--- a/builtin-pack-refs.c\n+++ b/builtin-pack-refs.c\n@@ -2,7 +2,7 @@\n #include \"parse-options.h\"\n #include \"pack-refs.h\"\n \n-static char const * const pack_refs_usage[] = {\n+static const char * const builtin_pack_refs_usage[] = {\n \t\"git pack-refs [options]\",\n \tNULL\n };\n@@ -15,7 +15,7 @@ int cmd_pack_refs(int argc, const char **argv, const char *prefix)\n \t\tOPT_BIT(0, \"prune\", &flags, \"prune loose refs (default)\", PACK_REFS_PRUNE),\n \t\tOPT_END(),\n \t};\n-\tif (parse_options(argc, argv, prefix, opts, pack_refs_usage, 0))\n-\t\tusage_with_options(pack_refs_usage, opts);\n+\tif (parse_options(argc, argv, prefix, opts, builtin_pack_refs_usage, 0))\n+\t\tusage_with_options(builtin_pack_refs_usage, opts);\n \treturn pack_refs(flags);\n }\ndiff --git a/builtin-prune-packed.c b/builtin-prune-packed.c\nindex be99eb0..5acc130 100644\n--- a/builtin-prune-packed.c\n+++ b/builtin-prune-packed.c\n@@ -3,7 +3,7 @@\n #include \"progress.h\"\n #include \"parse-options.h\"\n \n-static const char * const prune_packed_usage[] = {\n+static const char * const builtin_prune_packed_usage[] = {\n \t\"git prune-packed [-n|--dry-run] [-q|--quiet]\",\n \tNULL\n };\n@@ -79,7 +79,7 @@ int cmd_prune_packed(int argc, const char **argv, const char *prefix)\n \t};\n \n \targc = parse_options(argc, argv, prefix, prune_packed_options,\n-\t\t\t     prune_packed_usage, 0);\n+\t\t\t     builtin_prune_packed_usage, 0);\n \n \tprune_packed_objects(opts);\n \treturn 0;\ndiff --git a/builtin-prune.c b/builtin-prune.c\nindex 8459aec..6cf3555 100644\n--- a/builtin-prune.c\n+++ b/builtin-prune.c\n@@ -7,7 +7,7 @@\n #include \"parse-options.h\"\n #include \"dir.h\"\n \n-static const char * const prune_usage[] = {\n+static const char * const builtin_prune_usage[] = {\n \t\"git prune [-n] [-v] [--expire <time>] [--] [<head>...]\",\n \tNULL\n };\n@@ -143,7 +143,7 @@ int cmd_prune(int argc, const char **argv, const char *prefix)\n \tread_replace_refs = 0;\n \tinit_revisions(&revs, prefix);\n \n-\targc = parse_options(argc, argv, prefix, options, prune_usage, 0);\n+\targc = parse_options(argc, argv, prefix, options, builtin_prune_usage, 0);\n \twhile (argc--) {\n \t\tunsigned char sha1[20];\n \t\tconst char *name = *argv++;\ndiff --git a/builtin-push.c b/builtin-push.c\nindex 3cb1ee4..64b1b6e 100644\n--- a/builtin-push.c\n+++ b/builtin-push.c\n@@ -9,7 +9,7 @@\n #include \"transport.h\"\n #include \"parse-options.h\"\n \n-static const char * const push_usage[] = {\n+static const char * const builtin_push_usage[] = {\n \t\"git push [--all | --mirror] [-n | --dry-run] [--porcelain] [--tags] [--receive-pack=<git-receive-pack>] [--repo=<repository>] [-f | --force] [-v] [<repository> <refspec>...]\",\n \tNULL,\n };\n@@ -191,7 +191,7 @@ int cmd_push(int argc, const char **argv, const char *prefix)\n \t\tOPT_END()\n \t};\n \n-\targc = parse_options(argc, argv, prefix, options, push_usage, 0);\n+\targc = parse_options(argc, argv, prefix, options, builtin_push_usage, 0);\n \n \tif (tags)\n \t\tadd_refspec(\"refs/tags/*\");\n@@ -203,7 +203,7 @@ int cmd_push(int argc, const char **argv, const char *prefix)\n \n \trc = do_push(repo, flags);\n \tif (rc == -1)\n-\t\tusage_with_options(push_usage, options);\n+\t\tusage_with_options(builtin_push_usage, options);\n \telse\n \t\treturn rc;\n }\ndiff --git a/builtin-read-tree.c b/builtin-read-tree.c\nindex 14c836b..483d083 100644\n--- a/builtin-read-tree.c\n+++ b/builtin-read-tree.c\n@@ -30,7 +30,7 @@ static int list_tree(unsigned char *sha1)\n \treturn 0;\n }\n \n-static const char * const read_tree_usage[] = {\n+static const char * const builtin_read_tree_usage[] = {\n \t\"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] [-u [--exclude-per-directory=<gitignore>] | -i]]  [--index-output=<file>] <tree-ish1> [<tree-ish2> [<tree-ish3>]]\",\n \tNULL\n };\n@@ -111,7 +111,7 @@ int cmd_read_tree(int argc, const char **argv, const char *unused_prefix)\n \tnewfd = hold_locked_index(&lock_file, 1);\n \n \targc = parse_options(argc, argv, unused_prefix, read_tree_options,\n-\t\t\t     read_tree_usage, 0);\n+\t\t\t     builtin_read_tree_usage, 0);\n \n \tprefix_set = opts.prefix ? 1 : 0;\n \tif (1 < opts.merge + opts.reset + prefix_set)\ndiff --git a/builtin-receive-pack.c b/builtin-receive-pack.c\nindex b771fe9..42a21c9 100644\n--- a/builtin-receive-pack.c\n+++ b/builtin-receive-pack.c\n@@ -9,7 +9,7 @@\n #include \"remote.h\"\n #include \"transport.h\"\n \n-static const char receive_pack_usage[] = \"git receive-pack <git-dir>\";\n+static const char builtin_receive_pack_usage[] = \"git receive-pack <git-dir>\";\n \n enum deny_action {\n \tDENY_UNCONFIGURED,\n@@ -624,14 +624,14 @@ int cmd_receive_pack(int argc, const char **argv, const char *prefix)\n \n \t\tif (*arg == '-') {\n \t\t\t/* Do flag handling here */\n-\t\t\tusage(receive_pack_usage);\n+\t\t\tusage(builtin_receive_pack_usage);\n \t\t}\n \t\tif (dir)\n-\t\t\tusage(receive_pack_usage);\n+\t\t\tusage(builtin_receive_pack_usage);\n \t\tdir = xstrdup(arg);\n \t}\n \tif (!dir)\n-\t\tusage(receive_pack_usage);\n+\t\tusage(builtin_receive_pack_usage);\n \n \tsetup_path();\n \ndiff --git a/builtin-reflog.c b/builtin-reflog.c\nindex e23b5ef..940c39a 100644\n--- a/builtin-reflog.c\n+++ b/builtin-reflog.c\n@@ -693,7 +693,7 @@ static int cmd_reflog_delete(int argc, const char **argv, const char *prefix)\n  * main \"reflog\"\n  */\n \n-static const char reflog_usage[] =\n+static const char builtin_reflog_usage[] =\n \"git reflog [ show | expire | delete ]\";\n \n int cmd_reflog(int argc, const char **argv, const char *prefix)\n@@ -712,5 +712,5 @@ int cmd_reflog(int argc, const char **argv, const char *prefix)\n \t\treturn cmd_reflog_delete(argc - 1, argv + 1, prefix);\n \n \t/* Not a recognized reflog command..*/\n-\tusage(reflog_usage);\n+\tusage(builtin_reflog_usage);\n }\ndiff --git a/builtin-replace.c b/builtin-replace.c\nindex fe3a647..f855437 100644\n--- a/builtin-replace.c\n+++ b/builtin-replace.c\n@@ -13,7 +13,7 @@\n #include \"refs.h\"\n #include \"parse-options.h\"\n \n-static const char * const git_replace_usage[] = {\n+static const char * const builtin_replace_usage[] = {\n \t\"git replace [-f] <object> <replacement>\",\n \t\"git replace -d <object>...\",\n \t\"git replace -l [<pattern>]\",\n@@ -121,21 +121,21 @@ int cmd_replace(int argc, const char **argv, const char *prefix)\n \t\tOPT_END()\n \t};\n \n-\targc = parse_options(argc, argv, prefix, options, git_replace_usage, 0);\n+\targc = parse_options(argc, argv, prefix, options, builtin_replace_usage, 0);\n \n \tif (list && delete)\n \t\tusage_msg_opt(\"-l and -d cannot be used together\",\n-\t\t\t      git_replace_usage, options);\n+\t\t\t      builtin_replace_usage, options);\n \n \tif (force && (list || delete))\n \t\tusage_msg_opt(\"-f cannot be used with -d or -l\",\n-\t\t\t      git_replace_usage, options);\n+\t\t\t      builtin_replace_usage, options);\n \n \t/* Delete refs */\n \tif (delete) {\n \t\tif (argc < 1)\n \t\t\tusage_msg_opt(\"-d needs at least one argument\",\n-\t\t\t\t      git_replace_usage, options);\n+\t\t\t\t      builtin_replace_usage, options);\n \t\treturn for_each_replace_name(argv, delete_replace_ref);\n \t}\n \n@@ -143,17 +143,17 @@ int cmd_replace(int argc, const char **argv, const char *prefix)\n \tif (!list && argc) {\n \t\tif (argc != 2)\n \t\t\tusage_msg_opt(\"bad number of arguments\",\n-\t\t\t\t      git_replace_usage, options);\n+\t\t\t\t      builtin_replace_usage, options);\n \t\treturn replace_object(argv[0], argv[1], force);\n \t}\n \n \t/* List refs, even if \"list\" is not set */\n \tif (argc > 1)\n \t\tusage_msg_opt(\"only one pattern can be given with -l\",\n-\t\t\t      git_replace_usage, options);\n+\t\t\t      builtin_replace_usage, options);\n \tif (force)\n \t\tusage_msg_opt(\"-f needs some arguments\",\n-\t\t\t      git_replace_usage, options);\n+\t\t\t      builtin_replace_usage, options);\n \n \treturn list_replace_refs(argv[0]);\n }\ndiff --git a/builtin-rerere.c b/builtin-rerere.c\nindex adfb7b5..f19a0d3 100644\n--- a/builtin-rerere.c\n+++ b/builtin-rerere.c\n@@ -6,7 +6,7 @@\n #include \"xdiff/xdiff.h\"\n #include \"xdiff-interface.h\"\n \n-static const char git_rerere_usage[] =\n+static const char builtin_rerere_usage[] =\n \"git rerere [clear | status | diff | gc]\";\n \n /* these values are days */\n@@ -129,7 +129,7 @@ int cmd_rerere(int argc, const char **argv, const char *prefix)\n \t\t\tdiff_two(rerere_path(name, \"preimage\"), path, path, path);\n \t\t}\n \telse\n-\t\tusage(git_rerere_usage);\n+\t\tusage(builtin_rerere_usage);\n \n \tstring_list_clear(&merge_rr, 1);\n \treturn 0;\ndiff --git a/builtin-reset.c b/builtin-reset.c\nindex 73e6022..fe78fbd 100644\n--- a/builtin-reset.c\n+++ b/builtin-reset.c\n@@ -19,7 +19,7 @@\n #include \"branch.h\"\n #include \"parse-options.h\"\n \n-static const char * const git_reset_usage[] = {\n+static const char * const builtin_reset_usage[] = {\n \t\"git reset [--mixed | --soft | --hard | --merge] [-q] [<commit>]\",\n \t\"git reset [--mixed] <commit> [--] <paths>...\",\n \tNULL\n@@ -217,7 +217,7 @@ int cmd_reset(int argc, const char **argv, const char *prefix)\n \n \tgit_config(git_default_config, NULL);\n \n-\targc = parse_options(argc, argv, prefix, options, git_reset_usage,\n+\targc = parse_options(argc, argv, prefix, options, builtin_reset_usage,\n \t\t\t\t\t\tPARSE_OPT_KEEP_DASHDASH);\n \treflog_action = args_to_str(argv);\n \tsetenv(\"GIT_REFLOG_ACTION\", reflog_action, 0);\ndiff --git a/builtin-rev-list.c b/builtin-rev-list.c\nindex 4ba1c12..983039e 100644\n--- a/builtin-rev-list.c\n+++ b/builtin-rev-list.c\n@@ -8,7 +8,7 @@\n #include \"graph.h\"\n #include \"bisect.h\"\n \n-static const char rev_list_usage[] =\n+static const char builtin_rev_list_usage[] =\n \"git rev-list [OPTION] <commit-id>... [ -- paths... ]\\n\"\n \"  limiting output:\\n\"\n \"    --max-count=nr\\n\"\n@@ -354,7 +354,7 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)\n \t\t\tread_revisions_from_stdin(&revs);\n \t\t\tcontinue;\n \t\t}\n-\t\tusage(rev_list_usage);\n+\t\tusage(builtin_rev_list_usage);\n \n \t}\n \tif (revs.commit_format != CMIT_FMT_UNSPECIFIED) {\n@@ -373,7 +373,7 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)\n \t     (!(revs.tag_objects||revs.tree_objects||revs.blob_objects) &&\n \t      !revs.pending.nr)) ||\n \t    revs.diff)\n-\t\tusage(rev_list_usage);\n+\t\tusage(builtin_rev_list_usage);\n \n \tsave_commit_buffer = revs.verbose_header ||\n \t\trevs.grep_filter.pattern_list;\ndiff --git a/builtin-rev-parse.c b/builtin-rev-parse.c\nindex 45bead6..c91b056 100644\n--- a/builtin-rev-parse.c\n+++ b/builtin-rev-parse.c\n@@ -302,7 +302,7 @@ static const char *skipspaces(const char *s)\n static int cmd_parseopt(int argc, const char **argv, const char *prefix)\n {\n \tstatic int keep_dashdash = 0, stop_at_non_option = 0;\n-\tstatic char const * const parseopt_usage[] = {\n+\tstatic const char * const parseopt_usage[] = {\n \t\t\"git rev-parse --parseopt [options] -- [<args>...]\",\n \t\tNULL\n \t};\ndiff --git a/builtin-revert.c b/builtin-revert.c\nindex 151aa6a..918b3c2 100644\n--- a/builtin-revert.c\n+++ b/builtin-revert.c\n@@ -25,12 +25,12 @@\n  * Copyright (c) 2005 Junio C Hamano\n  */\n \n-static const char * const revert_usage[] = {\n+static const char * const builtin_revert_usage[] = {\n \t\"git revert [options] <commit-ish>\",\n \tNULL\n };\n \n-static const char * const cherry_pick_usage[] = {\n+static const char * const builtin_cherry_pick_usage[] = {\n \t\"git cherry-pick [options] <commit-ish>\",\n \tNULL\n };\n@@ -46,7 +46,7 @@ static const char *me;\n static void parse_args(int argc, const char **argv)\n {\n \tconst char * const * usage_str =\n-\t\taction == REVERT ?  revert_usage : cherry_pick_usage;\n+\t\taction == REVERT ?  builtin_revert_usage : builtin_cherry_pick_usage;\n \tunsigned char sha1[20];\n \tconst char *arg;\n \tint noop;\ndiff --git a/builtin-send-pack.c b/builtin-send-pack.c\nindex 37e528e..20a2476 100644\n--- a/builtin-send-pack.c\n+++ b/builtin-send-pack.c\n@@ -6,7 +6,7 @@\n #include \"remote.h\"\n #include \"send-pack.h\"\n \n-static const char send_pack_usage[] =\n+static const char builtin_send_pack_usage[] =\n \"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-receive-pack>] [--verbose] [--thin] [<host>:]<directory> [<ref>...]\\n\"\n \"  --all and explicit <ref> specification are mutually exclusive.\";\n \n@@ -523,7 +523,7 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix)\n \t\t\t\targs.use_thin_pack = 1;\n \t\t\t\tcontinue;\n \t\t\t}\n-\t\t\tusage(send_pack_usage);\n+\t\t\tusage(builtin_send_pack_usage);\n \t\t}\n \t\tif (!dest) {\n \t\t\tdest = arg;\n@@ -534,14 +534,14 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix)\n \t\tbreak;\n \t}\n \tif (!dest)\n-\t\tusage(send_pack_usage);\n+\t\tusage(builtin_send_pack_usage);\n \t/*\n \t * --all and --mirror are incompatible; neither makes sense\n \t * with any refspecs.\n \t */\n \tif ((refspecs && (send_all || args.send_mirror)) ||\n \t    (send_all && args.send_mirror))\n-\t\tusage(send_pack_usage);\n+\t\tusage(builtin_send_pack_usage);\n \n \tif (remote_name) {\n \t\tremote = remote_get(remote_name);\ndiff --git a/builtin-shortlog.c b/builtin-shortlog.c\nindex 4d4a3c8..1ce930a 100644\n--- a/builtin-shortlog.c\n+++ b/builtin-shortlog.c\n@@ -9,7 +9,7 @@\n #include \"shortlog.h\"\n #include \"parse-options.h\"\n \n-static char const * const shortlog_usage[] = {\n+static const char * const builtin_shortlog_usage[] = {\n \t\"git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]\",\n \t\"\",\n \t\"[rev-opts] are documented in git-rev-list(1)\",\n@@ -267,20 +267,20 @@ int cmd_shortlog(int argc, const char **argv, const char *prefix)\n \t\t\t    PARSE_OPT_KEEP_ARGV0);\n \n \tfor (;;) {\n-\t\tswitch (parse_options_step(&ctx, options, shortlog_usage)) {\n+\t\tswitch (parse_options_step(&ctx, options, builtin_shortlog_usage)) {\n \t\tcase PARSE_OPT_HELP:\n \t\t\texit(129);\n \t\tcase PARSE_OPT_DONE:\n \t\t\tgoto parse_done;\n \t\t}\n-\t\tparse_revision_opt(&rev, &ctx, options, shortlog_usage);\n+\t\tparse_revision_opt(&rev, &ctx, options, builtin_shortlog_usage);\n \t}\n parse_done:\n \targc = parse_options_end(&ctx);\n \n \tif (setup_revisions(argc, argv, &rev, NULL) != 1) {\n \t\terror(\"unrecognized argument: %s\", argv[1]);\n-\t\tusage_with_options(shortlog_usage, options);\n+\t\tusage_with_options(builtin_shortlog_usage, options);\n \t}\n \n \tlog.user_format = rev.commit_format == CMIT_FMT_USERFORMAT;\ndiff --git a/builtin-show-branch.c b/builtin-show-branch.c\nindex 3510a86..d1889ac 100644\n--- a/builtin-show-branch.c\n+++ b/builtin-show-branch.c\n@@ -5,7 +5,7 @@\n #include \"color.h\"\n #include \"parse-options.h\"\n \n-static const char* show_branch_usage[] = {\n+static const char * const builtin_show_branch_usage[] = {\n     \"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--current] [--color | --no-color] [--sparse] [--more=<n> | --list | --independent | --merge-base] [--no-name | --sha1-name] [--topics] [<rev> | <glob>]...\",\n     \"git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]\",\n     NULL\n@@ -697,7 +697,7 @@ int cmd_show_branch(int ac, const char **av, const char *prefix)\n \t}\n \n \tac = parse_options(ac, av, prefix, builtin_show_branch_options,\n-\t\t\t   show_branch_usage, PARSE_OPT_STOP_AT_NON_OPTION);\n+\t\t\t   builtin_show_branch_usage, PARSE_OPT_STOP_AT_NON_OPTION);\n \tif (all_heads)\n \t\tall_remotes = 1;\n \n@@ -706,7 +706,7 @@ int cmd_show_branch(int ac, const char **av, const char *prefix)\n \t\t * independent nor merge-base modes.\n \t\t */\n \t\tif (independent || merge_base)\n-\t\t\tusage_with_options(show_branch_usage,\n+\t\t\tusage_with_options(builtin_show_branch_usage,\n \t\t\t\t\t   builtin_show_branch_options);\n \t\tif (reflog && ((0 < extra) || all_heads || all_remotes))\n \t\t\t/*\ndiff --git a/builtin-show-ref.c b/builtin-show-ref.c\nindex c46550c..41844d1 100644\n--- a/builtin-show-ref.c\n+++ b/builtin-show-ref.c\n@@ -6,7 +6,7 @@\n #include \"string-list.h\"\n #include \"parse-options.h\"\n \n-static const char * const show_ref_usage[] = {\n+static const char * const builtin_show_ref_usage[] = {\n \t\"git show-ref [-q|--quiet] [--verify] [-h|--head] [-d|--dereference] [-s|--hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] \",\n \t\"git show-ref --exclude-existing[=pattern] < ref-list\",\n \tNULL\n@@ -202,7 +202,7 @@ static const struct option show_ref_options[] = {\n int cmd_show_ref(int argc, const char **argv, const char *prefix)\n {\n \targc = parse_options(argc, argv, prefix, show_ref_options,\n-\t\t\t     show_ref_usage, PARSE_OPT_NO_INTERNAL_HELP);\n+\t\t\t     builtin_show_ref_usage, PARSE_OPT_NO_INTERNAL_HELP);\n \n \tif (exclude_arg)\n \t\treturn exclude_existing(exclude_existing_arg);\ndiff --git a/builtin-symbolic-ref.c b/builtin-symbolic-ref.c\nindex ca855a5..72b8343 100644\n--- a/builtin-symbolic-ref.c\n+++ b/builtin-symbolic-ref.c\n@@ -3,7 +3,7 @@\n #include \"refs.h\"\n #include \"parse-options.h\"\n \n-static const char * const git_symbolic_ref_usage[] = {\n+static const char * const builtin_symbolic_ref_usage[] = {\n \t\"git symbolic-ref [options] name [ref]\",\n \tNULL\n };\n@@ -37,7 +37,7 @@ int cmd_symbolic_ref(int argc, const char **argv, const char *prefix)\n \n \tgit_config(git_default_config, NULL);\n \targc = parse_options(argc, argv, prefix, options,\n-\t\t\t     git_symbolic_ref_usage, 0);\n+\t\t\t     builtin_symbolic_ref_usage, 0);\n \tif (msg &&!*msg)\n \t\tdie(\"Refusing to perform update with empty message\");\n \tswitch (argc) {\n@@ -51,7 +51,7 @@ int cmd_symbolic_ref(int argc, const char **argv, const char *prefix)\n \t\tcreate_symref(argv[0], argv[1], msg);\n \t\tbreak;\n \tdefault:\n-\t\tusage_with_options(git_symbolic_ref_usage, options);\n+\t\tusage_with_options(builtin_symbolic_ref_usage, options);\n \t}\n \treturn 0;\n }\ndiff --git a/builtin-tag.c b/builtin-tag.c\nindex c479018..b19562b 100644\n--- a/builtin-tag.c\n+++ b/builtin-tag.c\n@@ -13,7 +13,7 @@\n #include \"run-command.h\"\n #include \"parse-options.h\"\n \n-static const char * const git_tag_usage[] = {\n+static const char * const builtin_tag_usage[] = {\n \t\"git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]\",\n \t\"git tag -d <tagname>...\",\n \t\"git tag -l [-n[<num>]] [<pattern>]\",\n@@ -404,7 +404,7 @@ int cmd_tag(int argc, const char **argv, const char *prefix)\n \n \tgit_config(git_tag_config, NULL);\n \n-\targc = parse_options(argc, argv, prefix, options, git_tag_usage, 0);\n+\targc = parse_options(argc, argv, prefix, options, builtin_tag_usage, 0);\n \n \tif (keyid) {\n \t\tsign = 1;\n@@ -417,10 +417,10 @@ int cmd_tag(int argc, const char **argv, const char *prefix)\n \n \tif ((annotate || msg.given || msgfile || force) &&\n \t    (list || delete || verify))\n-\t\tusage_with_options(git_tag_usage, options);\n+\t\tusage_with_options(builtin_tag_usage, options);\n \n \tif (list + delete + verify > 1)\n-\t\tusage_with_options(git_tag_usage, options);\n+\t\tusage_with_options(builtin_tag_usage, options);\n \tif (list)\n \t\treturn list_tags(argv[0], lines == -1 ? 0 : lines,\n \t\t\t\t with_commit);\ndiff --git a/builtin-tar-tree.c b/builtin-tar-tree.c\nindex 8b3a35e..278ccac 100644\n--- a/builtin-tar-tree.c\n+++ b/builtin-tar-tree.c\n@@ -7,7 +7,7 @@\n #include \"builtin.h\"\n #include \"quote.h\"\n \n-static const char tar_tree_usage[] =\n+static const char builtin_tar_tree_usage[] =\n \"git tar-tree [--remote=<repo>] <tree-ish> [basedir]\\n\"\n \"*** Note that this command is now deprecated; use \\\"git archive\\\" instead.\";\n \n@@ -45,7 +45,7 @@ int cmd_tar_tree(int argc, const char **argv, const char *prefix)\n \n \tswitch (argc) {\n \tdefault:\n-\t\tusage(tar_tree_usage);\n+\t\tusage(builtin_tar_tree_usage);\n \t\tbreak;\n \tcase 3:\n \t\t/* base-path */\ndiff --git a/builtin-unpack-objects.c b/builtin-unpack-objects.c\nindex 685566e..f571131 100644\n--- a/builtin-unpack-objects.c\n+++ b/builtin-unpack-objects.c\n@@ -13,7 +13,8 @@\n #include \"fsck.h\"\n \n static int dry_run, quiet, recover, has_errors, strict;\n-static const char unpack_usage[] = \"git unpack-objects [-n] [-q] [-r] [--strict] < pack-file\";\n+static const char builtin_unpack_usage[] =\n+\"git unpack-objects [-n] [-q] [-r] [--strict] < pack-file\";\n \n /* We always read in 4kB chunks. */\n static unsigned char buffer[4096];\n@@ -538,11 +539,11 @@ int cmd_unpack_objects(int argc, const char **argv, const char *prefix)\n \t\t\t\tlen = sizeof(*hdr);\n \t\t\t\tcontinue;\n \t\t\t}\n-\t\t\tusage(unpack_usage);\n+\t\t\tusage(builtin_unpack_usage);\n \t\t}\n \n \t\t/* We don't take any non-flag arguments now.. Maybe some day */\n-\t\tusage(unpack_usage);\n+\t\tusage(builtin_unpack_usage);\n \t}\n \tgit_SHA1_Init(&ctx);\n \tunpack_all();\ndiff --git a/builtin-update-index.c b/builtin-update-index.c\nindex 92beaaf..69133d6 100644\n--- a/builtin-update-index.c\n+++ b/builtin-update-index.c\n@@ -387,7 +387,7 @@ static void read_index_info(int line_termination)\n \tstrbuf_release(&uq);\n }\n \n-static const char update_index_usage[] =\n+static const char builtin_update_index_usage[] =\n \"git update-index [-q] [--add] [--replace] [--remove] [--unmerged] [--refresh] [--really-refresh] [--cacheinfo] [--chmod=(+|-)x] [--assume-unchanged] [--info-only] [--force-remove] [--stdin] [--index-info] [--unresolve] [--again | -g] [--ignore-missing] [-z] [--verbose] [--] <file>...\";\n \n static unsigned char head_sha1[20];\n@@ -703,7 +703,7 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)\n \t\t\t\tcontinue;\n \t\t\t}\n \t\t\tif (!strcmp(path, \"-h\") || !strcmp(path, \"--help\"))\n-\t\t\t\tusage(update_index_usage);\n+\t\t\t\tusage(builtin_update_index_usage);\n \t\t\tdie(\"unknown option %s\", path);\n \t\t}\n \t\tsetup_work_tree();\ndiff --git a/builtin-update-ref.c b/builtin-update-ref.c\nindex 76ba1d5..ab8f401 100644\n--- a/builtin-update-ref.c\n+++ b/builtin-update-ref.c\n@@ -3,7 +3,7 @@\n #include \"builtin.h\"\n #include \"parse-options.h\"\n \n-static const char * const git_update_ref_usage[] = {\n+static const char * const builtin_update_ref_usage[] = {\n \t\"git update-ref [options] -d <refname> [<oldval>]\",\n \t\"git update-ref [options]    <refname> <newval> [<oldval>]\",\n \tNULL\n@@ -23,20 +23,20 @@ int cmd_update_ref(int argc, const char **argv, const char *prefix)\n \t};\n \n \tgit_config(git_default_config, NULL);\n-\targc = parse_options(argc, argv, prefix, options, git_update_ref_usage,\n+\targc = parse_options(argc, argv, prefix, options, builtin_update_ref_usage,\n \t\t\t     0);\n \tif (msg && !*msg)\n \t\tdie(\"Refusing to perform update with empty message.\");\n \n \tif (delete) {\n \t\tif (argc < 1 || argc > 2)\n-\t\t\tusage_with_options(git_update_ref_usage, options);\n+\t\t\tusage_with_options(builtin_update_ref_usage, options);\n \t\trefname = argv[0];\n \t\toldval = argv[1];\n \t} else {\n \t\tconst char *value;\n \t\tif (argc < 2 || argc > 3)\n-\t\t\tusage_with_options(git_update_ref_usage, options);\n+\t\t\tusage_with_options(builtin_update_ref_usage, options);\n \t\trefname = argv[0];\n \t\tvalue = argv[1];\n \t\toldval = argv[2];\ndiff --git a/builtin-update-server-info.c b/builtin-update-server-info.c\nindex 2b3fddc..fd6c8aa 100644\n--- a/builtin-update-server-info.c\n+++ b/builtin-update-server-info.c\n@@ -2,7 +2,7 @@\n #include \"builtin.h\"\n #include \"parse-options.h\"\n \n-static const char * const update_server_info_usage[] = {\n+static const char * const builtin_update_server_info_usage[] = {\n \t\"git update-server-info [--force]\",\n \tNULL\n };\n@@ -17,9 +17,9 @@ int cmd_update_server_info(int argc, const char **argv, const char *prefix)\n \t};\n \n \targc = parse_options(argc, argv, prefix, options,\n-\t\t\t     update_server_info_usage, 0);\n+\t\t\t     builtin_update_server_info_usage, 0);\n \tif (argc > 0)\n-\t\tusage_with_options(update_server_info_usage, options);\n+\t\tusage_with_options(builtin_update_server_info_usage, options);\n \n \treturn !!update_server_info(force);\n }\ndiff --git a/builtin-upload-archive.c b/builtin-upload-archive.c\nindex c4cd1e1..480a857 100644\n--- a/builtin-upload-archive.c\n+++ b/builtin-upload-archive.c\n@@ -7,8 +7,7 @@\n #include \"pkt-line.h\"\n #include \"sideband.h\"\n \n-static const char upload_archive_usage[] =\n-\t\"git upload-archive <repo>\";\n+static const char builtin_upload_archive_usage[] = \"git upload-archive <repo>\";\n \n static const char deadchild[] =\n \"git upload-archive: archiver died with error\";\n@@ -27,7 +26,7 @@ static int run_upload_archive(int argc, const char **argv, const char *prefix)\n \tint len;\n \n \tif (argc != 2)\n-\t\tusage(upload_archive_usage);\n+\t\tusage(builtin_upload_archive_usage);\n \n \tif (strlen(argv[1]) + 1 > sizeof(buf))\n \t\tdie(\"insanely long repository name\");\ndiff --git a/builtin-verify-pack.c b/builtin-verify-pack.c\nindex b6079ae..6759520 100644\n--- a/builtin-verify-pack.c\n+++ b/builtin-verify-pack.c\n@@ -133,7 +133,7 @@ static int verify_one_pack(const char *path, unsigned int flags)\n \treturn err;\n }\n \n-static const char * const verify_pack_usage[] = {\n+static const char * const builtin_verify_pack_usage[] = {\n \t\"git verify-pack [-v|--verbose] [-s|--stat-only] <pack>...\",\n \tNULL\n };\n@@ -153,9 +153,9 @@ int cmd_verify_pack(int argc, const char **argv, const char *prefix)\n \n \tgit_config(git_default_config, NULL);\n \targc = parse_options(argc, argv, prefix, verify_pack_options,\n-\t\t\t     verify_pack_usage, 0);\n+\t\t\t     builtin_verify_pack_usage, 0);\n \tif (argc < 1)\n-\t\tusage_with_options(verify_pack_usage, verify_pack_options);\n+\t\tusage_with_options(builtin_verify_pack_usage, verify_pack_options);\n \tfor (i = 0; i < argc; i++) {\n \t\tif (verify_one_pack(argv[i], flags))\n \t\t\terr = 1;\ndiff --git a/builtin-verify-tag.c b/builtin-verify-tag.c\nindex 9f482c2..4f41301 100644\n--- a/builtin-verify-tag.c\n+++ b/builtin-verify-tag.c\n@@ -12,7 +12,7 @@\n #include <signal.h>\n #include \"parse-options.h\"\n \n-static const char * const verify_tag_usage[] = {\n+static const char * const builtin_verify_tag_usage[] = {\n \t\t\"git verify-tag [-v|--verbose] <tag>...\",\n \t\tNULL\n };\n@@ -100,9 +100,9 @@ int cmd_verify_tag(int argc, const char **argv, const char *prefix)\n \tgit_config(git_default_config, NULL);\n \n \targc = parse_options(argc, argv, prefix, verify_tag_options,\n-\t\t\t     verify_tag_usage, PARSE_OPT_KEEP_ARGV0);\n+\t\t\t     builtin_verify_tag_usage, PARSE_OPT_KEEP_ARGV0);\n \tif (argc <= i)\n-\t\tusage_with_options(verify_tag_usage, verify_tag_options);\n+\t\tusage_with_options(builtin_verify_tag_usage, verify_tag_options);\n \n \t/* sometimes the program was terminated because this signal\n \t * was received in the process of writing the gpg input: */\ndiff --git a/builtin-write-tree.c b/builtin-write-tree.c\nindex b223af4..013de8e 100644\n--- a/builtin-write-tree.c\n+++ b/builtin-write-tree.c\n@@ -9,7 +9,7 @@\n #include \"cache-tree.h\"\n #include \"parse-options.h\"\n \n-static const char * const write_tree_usage[] = {\n+static const char * const builtin_write_tree_usage[] = {\n \t\"git write-tree [--missing-ok] [--prefix=<prefix>/]\",\n \tNULL\n };\n@@ -35,7 +35,7 @@ int cmd_write_tree(int argc, const char **argv, const char *unused_prefix)\n \n \tgit_config(git_default_config, NULL);\n \targc = parse_options(argc, argv, unused_prefix, write_tree_options,\n-\t\t\t     write_tree_usage, 0);\n+\t\t\t     builtin_write_tree_usage, 0);\n \n \tret = write_cache_as_tree(sha1, flags, prefix);\n \tswitch (ret) {\n-- \n1.6.5.rc1.37.gf5c31\n"},{"id":"123540","messageId":"20090920143526.GA22295@dualtron.vpn.rwth-aachen.de","threadId":"21006","inReplyTo":"1253452645-3220-1-git-send-email-tfransosi@gmail.com","subject":"Re: [PATCH] Trivial fix: Make all the builtin usage strings to use the same pattern.","fromName":"Johannes Gilger","fromEmail":"heipei@hackvalue.de","sentAt":"2009-09-20T14:35:27Z","receivedAt":"2009-09-20T14:35:27Z","isPatch":true,"sender":{"key":"heipei@hackvalue.de","avatar":"https://avatars.githubusercontent.com/u/6072?v=4"},"body":"On 20/09/09 09:17, Thiago Farina wrote:\n> They follow the pattern of file name:\n> File name pattern: builtin-command-name.c\n> Usage string pattern: builtin_command_name_usage\n> [...]\n> -static char const * const archive_usage[] = {\n> +static const char * const archive_usage[] = {\n>  \t\"git archive [options] <tree-ish> [path...]\",\n>  \t\"git archive --list\",\n>  \t\"git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [path...]\",\nLooks like you missed a spot ;)\n\nGreetings,\nJojo\n\n-- \nJohannes Gilger <heipei@hackvalue.de>\nhttp://heipei.net\nGPG-Key: 0x42F6DE81\nGPG-Fingerprint: BB49 F967 775E BB52 3A81  882C 58EE B178 42F6 DE81\n"},{"id":"123541","messageId":"a4c8a6d00909200751r87fdf83oe92e5a2076b1b527@mail.gmail.com","threadId":"21006","inReplyTo":"20090920143526.GA22295@dualtron.vpn.rwth-aachen.de","subject":"Re: [PATCH] Trivial fix: Make all the builtin usage strings to use the same pattern.","fromName":"Thiago Farina","fromEmail":"tfransosi@gmail.com","sentAt":"2009-09-20T14:51:02Z","receivedAt":"2009-09-20T14:51:02Z","isPatch":true,"sender":{"key":"tfransosi@gmail.com","avatar":"https://avatars.githubusercontent.com/u/970071?v=4"},"body":"On Sun, Sep 20, 2009 at 11:35 AM, Johannes Gilger <heipei@hackvalue.de> wrote:\n> On 20/09/09 09:17, Thiago Farina wrote:\n>> They follow the pattern of file name:\n>> File name pattern: builtin-command-name.c\n>> Usage string pattern: builtin_command_name_usage\n>> [...]\n>> -static char const * const archive_usage[] = {\n>> +static const char * const archive_usage[] = {\n>>       \"git archive [options] <tree-ish> [path...]\",\n>>       \"git archive --list\",\n>>       \"git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [path...]\",\n> Looks like you missed a spot ;)\nThe change here is about 'char const *' to 'const char *', to match\nwith the definition in api-parse-options.txt. :)\nIs there a reason for archive do not has a builtin- in it file name?\n"},{"id":"123584","messageId":"pN7ragma8Ra75P8lN7iHuXE6FyUXHXFlnHUVFZqJV4WM7w5mCkVHcQ@cipher.nrlssc.navy.mil","threadId":"21006","inReplyTo":"1253452645-3220-1-git-send-email-tfransosi@gmail.com","subject":"Re: [PATCH] Trivial fix: Make all the builtin usage strings to use the same pattern.","fromName":"Brandon Casey","fromEmail":"brandon.casey.ctr@nrlssc.navy.mil","sentAt":"2009-09-21T15:28:36Z","receivedAt":"2009-09-21T15:28:36Z","isPatch":true,"sender":{"key":"brandon.casey.ctr@nrlssc.navy.mil","avatar":null},"body":"Thiago Farina wrote:\n> They follow the pattern of file name:\n> File name pattern: builtin-command-name.c\n> Usage string pattern: builtin_command_name_usage\n> \n> Signed-off-by: Thiago Farina <tfransosi@gmail.com>\n> ---\n\n> diff --git a/builtin-blame.c b/builtin-blame.c\n> index 7512773..4adae84 100644\n> --- a/builtin-blame.c\n> +++ b/builtin-blame.c\n> @@ -21,10 +21,11 @@\n>  #include \"parse-options.h\"\n>  #include \"utf8.h\"\n>  \n> -static char blame_usage[] = \"git blame [options] [rev-opts] [rev] [--] file\";\n> +static char builtin_blame_usage[] =\n\nShould this one also use 'const'?\n\n> +\"git blame [options] [rev-opts] [rev] [--] file\";\n>  \n>  static const char *blame_opt_usage[] = {\n> -\tblame_usage,\n> +\tbuiltin_blame_usage,\n>  \t\"\",\n>  \t\"[rev-opts] are documented in git-rev-list(1)\",\n>  \tNULL\n\n> diff --git a/builtin-count-objects.c b/builtin-count-objects.c\n> index 1b0b6c8..fbe0972 100644\n> --- a/builtin-count-objects.c\n> +++ b/builtin-count-objects.c\n> @@ -65,7 +65,7 @@ static void count_objects(DIR *d, char *path, int len, int verbose,\n>  \t}\n>  }\n>  \n> -static char const * const count_objects_usage[] = {\n> +static char const * const builtin_count_objects_usage[] = {\n\nThis one is different from the others.  I assume 'char const *' is\nthe same as 'const char *', though I'm used to seeing the latter\nform.  If we're going for consistency, maybe this should be changed\ntoo.  Ultra minor nit-pick.  I noticed it, so I mentioned it, but\nits your choice.\n\n>  \t\"git count-objects [-v]\",\n>  \tNULL\n>  };\n\n> diff --git a/builtin-for-each-ref.c b/builtin-for-each-ref.c\n> index a5a83f1..715d378 100644\n> --- a/builtin-for-each-ref.c\n> +++ b/builtin-for-each-ref.c\n> @@ -881,7 +881,7 @@ static int opt_parse_sort(const struct option *opt, const char *arg, int unset)\n>  \treturn 0;\n>  }\n>  \n> -static char const * const for_each_ref_usage[] = {\n> +static char const * const builtin_for_each_ref_usage[] = {\n\nditto\n\n>  \t\"git for-each-ref [options] [<pattern>]\",\n>  \tNULL\n>  };\n\n> diff --git a/builtin-fsck.c b/builtin-fsck.c\n> index c58b0e3..0857357 100644\n> --- a/builtin-fsck.c\n> +++ b/builtin-fsck.c\n> @@ -564,7 +564,7 @@ static int fsck_cache_tree(struct cache_tree *it)\n>  \treturn err;\n>  }\n>  \n> -static char const * const fsck_usage[] = {\n> +static char const * const builtin_fsck_usage[] = {\n\nditto\n\n>  \t\"git fsck [options] [<object>...]\",\n>  \tNULL\n>  };\n"},{"id":"123587","messageId":"4AB7A534.2070406@viscovery.net","threadId":"21006","inReplyTo":"1253452645-3220-1-git-send-email-tfransosi@gmail.com","subject":"Re: [PATCH] Trivial fix: Make all the builtin usage strings to use the same pattern.","fromName":"Johannes Sixt","fromEmail":"j.sixt@viscovery.net","sentAt":"2009-09-21T16:09:24Z","receivedAt":"2009-09-21T16:09:24Z","isPatch":true,"sender":{"key":"j6t@kdbg.org","avatar":"https://avatars.githubusercontent.com/u/14810926?v=4"},"body":"Thiago Farina schrieb:\n> They follow the pattern of file name:\n> File name pattern: builtin-command-name.c\n> Usage string pattern: builtin_command_name_usage\n\nWell, file names are not so constant: every now and then an external\ncommand is turned into a builtin (and the filename is changed), and we\nhave even seen that a builtin was turned into an external command.\nMoreover, some commands are implemented in the same file, for example 'git\nlog' and 'git show'. How about naming the variable after the command name?\nE.g.:\n\ncommand:  git cat-file\nvariable: git_cat_file_usage\n\n-- Hannes\n"},{"id":"123601","messageId":"a4c8a6d00909211305h6c29d88bi9ddf9a7003f5c937@mail.gmail.com","threadId":"21006","inReplyTo":"pN7ragma8Ra75P8lN7iHuXE6FyUXHXFlnHUVFZqJV4WM7w5mCkVHcQ@cipher.nrlssc.navy.mil","subject":"Re: [PATCH] Trivial fix: Make all the builtin usage strings to use the same pattern.","fromName":"Thiago Farina","fromEmail":"tfransosi@gmail.com","sentAt":"2009-09-21T20:05:35Z","receivedAt":"2009-09-21T20:05:35Z","isPatch":true,"sender":{"key":"tfransosi@gmail.com","avatar":"https://avatars.githubusercontent.com/u/970071?v=4"},"body":"On Mon, Sep 21, 2009 at 12:28 PM, Brandon Casey\n<brandon.casey.ctr@nrlssc.navy.mil> wrote:\n> Thiago Farina wrote:\n>> They follow the pattern of file name:\n>> File name pattern: builtin-command-name.c\n>> Usage string pattern: builtin_command_name_usage\n>>\n>> Signed-off-by: Thiago Farina <tfransosi@gmail.com>\n>> ---\n>\n>> diff --git a/builtin-blame.c b/builtin-blame.c\n>> index 7512773..4adae84 100644\n>> --- a/builtin-blame.c\n>> +++ b/builtin-blame.c\n>> @@ -21,10 +21,11 @@\n>>  #include \"parse-options.h\"\n>>  #include \"utf8.h\"\n>>\n>> -static char blame_usage[] = \"git blame [options] [rev-opts] [rev] [--] file\";\n>> +static char builtin_blame_usage[] =\n>\n> Should this one also use 'const'?\nIt can use const here. I will do this change in the next patch.\n>\n>> +\"git blame [options] [rev-opts] [rev] [--] file\";\n>>\n>>  static const char *blame_opt_usage[] = {\n>> -     blame_usage,\n>> +     builtin_blame_usage,\n>>       \"\",\n>>       \"[rev-opts] are documented in git-rev-list(1)\",\n>>       NULL\n>\n>> diff --git a/builtin-count-objects.c b/builtin-count-objects.c\n>> index 1b0b6c8..fbe0972 100644\n>> --- a/builtin-count-objects.c\n>> +++ b/builtin-count-objects.c\n>> @@ -65,7 +65,7 @@ static void count_objects(DIR *d, char *path, int len, int verbose,\n>>       }\n>>  }\n>>\n>> -static char const * const count_objects_usage[] = {\n>> +static char const * const builtin_count_objects_usage[] = {\n>\n> This one is different from the others.  I assume 'char const *' is\n> the same as 'const char *', though I'm used to seeing the latter\n> form.  If we're going for consistency, maybe this should be changed\n> too.  Ultra minor nit-pick.  I noticed it, so I mentioned it, but\n> its your choice.\nTo maintain the consistency I will follow the latter form, since all\nothers are using \"const char *\".\nThanks for catching the ones that I missed. I will update them in the\nnext patch.\n"},{"id":"123605","messageId":"a4c8a6d00909211439j3638d924xedccd4c2f8702261@mail.gmail.com","threadId":"21006","inReplyTo":"4AB7A534.2070406@viscovery.net","subject":"Re: [PATCH] Trivial fix: Make all the builtin usage strings to use the same pattern.","fromName":"Thiago Farina","fromEmail":"tfransosi@gmail.com","sentAt":"2009-09-21T21:39:45Z","receivedAt":"2009-09-21T21:39:45Z","isPatch":true,"sender":{"key":"tfransosi@gmail.com","avatar":"https://avatars.githubusercontent.com/u/970071?v=4"},"body":"On Mon, Sep 21, 2009 at 1:09 PM, Johannes Sixt <j.sixt@viscovery.net> wrote:\n> Thiago Farina schrieb:\n>> They follow the pattern of file name:\n>> File name pattern: builtin-command-name.c\n>> Usage string pattern: builtin_command_name_usage\n>\n> Well, file names are not so constant: every now and then an external\n> command is turned into a builtin (and the filename is changed), and we\n> have even seen that a builtin was turned into an external command.\n> Moreover, some commands are implemented in the same file, for example 'git\n> log' and 'git show'. How about naming the variable after the command name?\n> E.g.:\n>\n> command:  git cat-file\n> variable: git_cat_file_usage\nThat sounds good, I will follow this pattern in the next patch. So all\nexisting builtin_command_name_usage will be changed to\ngit_command_name_usage, command_name_usage to git_command_name_usage,\netc.\n"}]}