{"thread":{"id":"166","subject":"[PATCH] Unify usage() strings.","startedAt":"2005-04-20T07:46:21Z","lastAt":"2005-04-20T07:46:21Z","messageCount":1,"participants":["Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"951","messageId":"7vvf6hki0i.fsf@assigned-by-dhcp.cox.net","threadId":"166","inReplyTo":null,"subject":"[PATCH] Unify usage() strings.","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2005-04-20T07:46:21Z","receivedAt":"2005-04-20T07:46:21Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"This patch changes identical cut-and-paste usage strings into a\nsingle instance of static string, to make maintenance easier.\n\nSigned-off-by: Junio C Hamano <junkio@cox.net>\n---\n\n commit-tree.c |   14 ++++++--------\n diff-cache.c  |    6 ++++--\n diff-tree.c   |    6 ++++--\n read-tree.c   |   10 ++++++----\n 4 files changed, 20 insertions(+), 16 deletions(-)\n\n\n\ncommit-tree.c: 2eee2fe5b14f1f2d86b8d41b501a879b190bf08f\n--- a/commit-tree.c\n+++ b/commit-tree.c\n@@ -268,15 +268,13 @@ static void check_valid(unsigned char *s\n }\n \n /*\n- * Having more than two parents may be strange, but hey, there's\n- * no conceptual reason why the file format couldn't accept multi-way\n- * merges. It might be the \"union\" of several packages, for example.\n- *\n- * I don't really expect that to happen, but this is here to make\n- * it clear that _conceptually_ it's ok..\n+ * Having more than two parents is not strange at all, and this is\n+ * how multi-way merges are represented.\n  */\n #define MAXPARENT (16)\n \n+static char *commit_tree_usage = \"commit-tree <sha1> [-p <sha1>]* < changelog\";\n+\n int main(int argc, char **argv)\n {\n \tint i, len;\n@@ -296,14 +294,14 @@ int main(int argc, char **argv)\n \tunsigned int size;\n \n \tif (argc < 2 || get_sha1_hex(argv[1], tree_sha1) < 0)\n-\t\tusage(\"commit-tree <sha1> [-p <sha1>]* < changelog\");\n+\t\tusage(commit_tree_usage);\n \n \tcheck_valid(tree_sha1, \"tree\");\n \tfor (i = 2; i < argc; i += 2) {\n \t\tchar *a, *b;\n \t\ta = argv[i]; b = argv[i+1];\n \t\tif (!b || strcmp(a, \"-p\") || get_sha1_hex(b, parent_sha1[parents]))\n-\t\t\tusage(\"commit-tree <sha1> [-p <sha1>]* < changelog\");\n+\t\t\tusage(commit_tree_usage);\n \t\tcheck_valid(parent_sha1[parents], \"commit\");\n \t\tparents++;\n \t}\n\n\ndiff-cache.c: 48bcec1230365e12b9fb6df65c15540caea24029\n--- a/diff-cache.c\n+++ b/diff-cache.c\n@@ -215,6 +215,8 @@ static int diff_cache(void *tree, unsign\n \treturn 0;\n }\n \n+static char *diff_cache_usage = \"diff-cache [-r] [-z] [--cached] <tree sha1>\";\n+\n int main(int argc, char **argv)\n {\n \tunsigned char tree_sha1[20];\n@@ -239,11 +241,11 @@ int main(int argc, char **argv)\n \t\t\tcached_only = 1;\n \t\t\tcontinue;\n \t\t}\n-\t\tusage(\"diff-cache [-r] [-z] <tree sha1>\");\n+\t\tusage(diff_cache_usage);\n \t}\n \n \tif (argc != 2 || get_sha1_hex(argv[1], tree_sha1))\n-\t\tusage(\"diff-cache [-r] [-z] <tree sha1>\");\n+\t\tusage(diff_cache_usage);\n \n \ttree = tree_from_tree_or_commit(tree_sha1, type, &size);\n \tif (!tree)\ndiff-tree.c: 8720ce75b72cdf9c8d189f9edf41e0920bd72767\n--- a/diff-tree.c\n+++ b/diff-tree.c\n@@ -193,6 +193,8 @@ static void commit_to_tree(unsigned char\n \t}\n }\n \n+static char *diff_tree_usage = \"diff-tree [-r] [-z] <tree sha1> <tree sha1>\";\n+\n int main(int argc, char **argv)\n {\n \tunsigned char old[20], new[20];\n@@ -209,11 +211,11 @@ int main(int argc, char **argv)\n \t\t\tline_termination = '\\0';\n \t\t\tcontinue;\n \t\t}\n-\t\tusage(\"diff-tree [-r] [-z] <tree sha1> <tree sha1>\");\n+\t\tusage(diff_tree_usage);\n \t}\n \n \tif (argc != 3 || get_sha1_hex(argv[1], old) || get_sha1_hex(argv[2], new))\n-\t\tusage(\"diff-tree <tree sha1> <tree sha1>\");\n+\t\tusage(diff_tree_usage);\n \tcommit_to_tree(old);\n \tcommit_to_tree(new);\n \treturn diff_tree_sha1(old, new, \"\");\n\n\nread-tree.c: e438579d63fb090209eaf4c864586afaeb52ae0f\n--- a/read-tree.c\n+++ b/read-tree.c\n@@ -201,6 +201,8 @@ static void merge_stat_info(struct cache\n \t}\n }\n \n+static char *read_tree_usage = \"read-tree (<sha> | -m <sha1> [<sha2> <sha3>])\";\n+\n int main(int argc, char **argv)\n {\n \tint i, newfd, merge;\n@@ -220,20 +222,20 @@ int main(int argc, char **argv)\n \t\tif (!strcmp(arg, \"-m\")) {\n \t\t\tint i;\n \t\t\tif (stage)\n-\t\t\t\tusage(\"-m needs to come first\");\n+\t\t\t\tdie(\"-m needs to come first\");\n \t\t\tread_cache();\n \t\t\tfor (i = 0; i < active_nr; i++) {\n \t\t\t\tif (ce_stage(active_cache[i]))\n-\t\t\t\t\tusage(\"you need to resolve your current index first\");\n+\t\t\t\t\tdie(\"you need to resolve your current index first\");\n \t\t\t}\n \t\t\tstage = 1;\n \t\t\tmerge = 1;\n \t\t\tcontinue;\n \t\t}\n \t\tif (get_sha1_hex(arg, sha1) < 0)\n-\t\t\tusage(\"read-tree [-m] <sha1>\");\n+\t\t\tusage(read_tree_usage);\n \t\tif (stage > 3)\n-\t\t\tusage(\"can't merge more than two trees\");\n+\t\t\tusage(read_tree_usage);\n \t\tif (read_tree(sha1, \"\", 0) < 0)\n \t\t\tdie(\"failed to unpack tree object %s\", arg);\n \t\tstage++;\n\n"}]}