{"thread":{"id":"15446","subject":"[PATCH] Start conforming code to \"git subcmd\" style part 2","startedAt":"2008-09-09T10:28:30Z","lastAt":"2008-09-10T01:43:41Z","messageCount":2,"participants":["Heikki Orsila","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"90201","messageId":"20080909102830.GA9856@zakalwe.fi","threadId":"15446","inReplyTo":null,"subject":"[PATCH] Start conforming code to \"git subcmd\" style part 2","fromName":"Heikki Orsila","fromEmail":"heikki.orsila@iki.fi","sentAt":"2008-09-09T10:28:30Z","receivedAt":"2008-09-09T10:28:30Z","isPatch":true,"sender":{"key":"heikki.orsila@iki.fi","avatar":null},"body":"User notifications are presented as 'git cmd', and code comments\nare presented as '\"cmd\"' or 'git's cmd', rather than 'git-cmd'.\n\nSigned-off-by: Heikki Orsila <heikki.orsila@iki.fi>\n---\n builtin-checkout-index.c |   14 +++++++-------\n builtin-commit-tree.c    |    2 +-\n builtin-fetch-pack.c     |    2 +-\n builtin-fetch.c          |    6 +++---\n builtin-http-fetch.c     |    4 ++--\n 5 files changed, 14 insertions(+), 14 deletions(-)\n\ndiff --git a/builtin-checkout-index.c b/builtin-checkout-index.c\nindex 90f8523..55b7aaf 100644\n--- a/builtin-checkout-index.c\n+++ b/builtin-checkout-index.c\n@@ -5,26 +5,26 @@\n  *\n  * Careful: order of argument flags does matter. For example,\n  *\n- *\tgit-checkout-index -a -f file.c\n+ *\tgit checkout-index -a -f file.c\n  *\n  * Will first check out all files listed in the cache (but not\n  * overwrite any old ones), and then force-checkout \"file.c\" a\n  * second time (ie that one _will_ overwrite any old contents\n  * with the same filename).\n  *\n- * Also, just doing \"git-checkout-index\" does nothing. You probably\n- * meant \"git-checkout-index -a\". And if you want to force it, you\n- * want \"git-checkout-index -f -a\".\n+ * Also, just doing \"git checkout-index\" does nothing. You probably\n+ * meant \"git checkout-index -a\". And if you want to force it, you\n+ * want \"git checkout-index -f -a\".\n  *\n  * Intuitiveness is not the goal here. Repeatability is. The\n  * reason for the \"no arguments means no work\" thing is that\n  * from scripts you are supposed to be able to do things like\n  *\n- *\tfind . -name '*.h' -print0 | xargs -0 git-checkout-index -f --\n+ *\tfind . -name '*.h' -print0 | xargs -0 git checkout-index -f --\n  *\n  * or:\n  *\n- *\tfind . -name '*.h' -print0 | git-checkout-index -f -z --stdin\n+ *\tfind . -name '*.h' -print0 | git checkout-index -f -z --stdin\n  *\n  * which will force all existing *.h files to be replaced with\n  * their cached copies. If an empty command line implied \"all\",\n@@ -107,7 +107,7 @@ static int checkout_file(const char *name, int prefix_length)\n \t}\n \n \tif (!state.quiet) {\n-\t\tfprintf(stderr, \"git-checkout-index: %s \", name);\n+\t\tfprintf(stderr, \"git checkout-index: %s \", name);\n \t\tif (!has_same_name)\n \t\t\tfprintf(stderr, \"is not in the cache\");\n \t\telse if (checkout_stage)\ndiff --git a/builtin-commit-tree.c b/builtin-commit-tree.c\nindex 8a5ba4c..f2684bb 100644\n--- a/builtin-commit-tree.c\n+++ b/builtin-commit-tree.c\n@@ -24,7 +24,7 @@ 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 commit_tree_usage[] = \"git commit-tree <sha1> [-p <sha1>]* < changelog\";\n \n static void new_parent(struct commit *parent, struct commit_list **parents_p)\n {\ndiff --git a/builtin-fetch-pack.c b/builtin-fetch-pack.c\nindex 459c6f0..4dfef29 100644\n--- a/builtin-fetch-pack.c\n+++ b/builtin-fetch-pack.c\n@@ -750,7 +750,7 @@ int cmd_fetch_pack(int argc, const char **argv, const char *prefix)\n \tif (!ret && nr_heads) {\n \t\t/* If the heads to pull were given, we should have\n \t\t * consumed all of them by matching the remote.\n-\t\t * Otherwise, 'git-fetch remote no-such-ref' would\n+\t\t * Otherwise, 'git fetch remote no-such-ref' would\n \t\t * silently succeed without issuing an error.\n \t\t */\n \t\tfor (i = 0; i < nr_heads; i++)\ndiff --git a/builtin-fetch.c b/builtin-fetch.c\nindex 7eec4a0..ee93d3a 100644\n--- a/builtin-fetch.c\n+++ b/builtin-fetch.c\n@@ -86,10 +86,10 @@ static void add_merge_config(struct ref **head,\n \t\t/*\n \t\t * Not fetched to a tracking branch?  We need to fetch\n \t\t * it anyway to allow this branch's \"branch.$name.merge\"\n-\t\t * to be honored by git-pull, but we do not have to\n+\t\t * to be honored by 'git pull', but we do not have to\n \t\t * fail if branch.$name.merge is misconfigured to point\n \t\t * at a nonexisting branch.  If we were indeed called by\n-\t\t * git-pull, it will notice the misconfiguration because\n+\t\t * 'git pull', it will notice the misconfiguration because\n \t\t * there is no entry in the resulting FETCH_HEAD marked\n \t\t * for merging.\n \t\t */\n@@ -396,7 +396,7 @@ static int store_updated_refs(const char *url, const char *remote_name,\n  * The refs we are going to fetch are in to_fetch (nr_heads in\n  * total).  If running\n  *\n- *  $ git-rev-list --objects to_fetch[0] to_fetch[1] ... --not --all\n+ *  $ git rev-list --objects to_fetch[0] to_fetch[1] ... --not --all\n  *\n  * does not error out, that means everything reachable from the\n  * refs we are going to fetch exists and is connected to some of\ndiff --git a/builtin-http-fetch.c b/builtin-http-fetch.c\nindex 3a06248..03f34d7 100644\n--- a/builtin-http-fetch.c\n+++ b/builtin-http-fetch.c\n@@ -42,7 +42,7 @@ int cmd_http_fetch(int argc, const char **argv, const char *prefix)\n \t\targ++;\n \t}\n \tif (argc < arg + 2 - commits_on_stdin) {\n-\t\tusage(\"git-http-fetch [-c] [-t] [-a] [-v] [--recover] [-w ref] [--stdin] commit-id url\");\n+\t\tusage(\"git http-fetch [-c] [-t] [-a] [-v] [--recover] [-w ref] [--stdin] commit-id url\");\n \t\treturn 1;\n \t}\n \tif (commits_on_stdin) {\n@@ -75,7 +75,7 @@ int cmd_http_fetch(int argc, const char **argv, const char *prefix)\n \t\tfprintf(stderr,\n \"Some loose object were found to be corrupt, but they might be just\\n\"\n \"a false '404 Not Found' error message sent with incorrect HTTP\\n\"\n-\"status code.  Suggest running git-fsck.\\n\");\n+\"status code.  Suggest running 'git fsck'.\\n\");\n \t}\n \n \twalker_free(walker);\n-- \n1.6.0.1\n"},{"id":"90304","messageId":"7v3ak83hde.fsf@gitster.siamese.dyndns.org","threadId":"15446","inReplyTo":"20080909102830.GA9856@zakalwe.fi","subject":"Re: [PATCH] Start conforming code to \"git subcmd\" style part 2","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-09-10T01:43:41Z","receivedAt":"2008-09-10T01:43:41Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Heikki Orsila <heikki.orsila@iki.fi> writes:\n\n> User notifications are presented as 'git cmd', and code comments\n> are presented as '\"cmd\"' or 'git's cmd', rather than 'git-cmd'.\n>\n> Signed-off-by: Heikki Orsila <heikki.orsila@iki.fi>\n\nAll changes here look good to me.  Also \"git grep -e git-\" on the affected\nfiles I do not see any leftover that should have been converted.\n\nThanks.\n"}]}