{"thread":{"id":"16986","subject":"[PATCH] Replace deprecated dashed git commands in usage","startedAt":"2009-01-04T18:39:27Z","lastAt":"2009-01-04T18:39:27Z","messageCount":1,"participants":["Alexander Potashev"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"99319","messageId":"1231094367-8831-1-git-send-email-aspotashev@gmail.com","threadId":"16986","inReplyTo":null,"subject":"[PATCH] Replace deprecated dashed git commands in usage","fromName":"Alexander Potashev","fromEmail":"aspotashev@gmail.com","sentAt":"2009-01-04T18:39:27Z","receivedAt":"2009-01-04T18:39:27Z","isPatch":true,"sender":{"key":"aspotashev@gmail.com","avatar":null},"body":"Signed-off-by: Alexander Potashev <aspotashev@gmail.com>\n---\n builtin-merge.c        |    4 ++--\n builtin-receive-pack.c |    2 +-\n builtin-verify-pack.c  |    2 +-\n merge-index.c          |    2 +-\n merge-tree.c           |    2 +-\n mktag.c                |    2 +-\n mktree.c               |    2 +-\n patch-id.c             |    2 +-\n unpack-file.c          |    2 +-\n upload-pack.c          |    2 +-\n 10 files changed, 11 insertions(+), 11 deletions(-)\n\ndiff --git a/builtin-merge.c b/builtin-merge.c\nindex cf86975..261a92e 100644\n--- a/builtin-merge.c\n+++ b/builtin-merge.c\n@@ -36,8 +36,8 @@ struct strategy {\n };\n \n static const char * const builtin_merge_usage[] = {\n-\t\"git-merge [options] <remote>...\",\n-\t\"git-merge [options] <msg> HEAD <remote>\",\n+\t\"git merge [options] <remote>...\",\n+\t\"git merge [options] <msg> HEAD <remote>\",\n \tNULL\n };\n \ndiff --git a/builtin-receive-pack.c b/builtin-receive-pack.c\nindex db67c31..929df19 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 receive_pack_usage[] = \"git receive-pack <git-dir>\";\n \n enum deny_action {\n \tDENY_IGNORE,\ndiff --git a/builtin-verify-pack.c b/builtin-verify-pack.c\nindex 25a29f1..0ee0a9a 100644\n--- a/builtin-verify-pack.c\n+++ b/builtin-verify-pack.c\n@@ -107,7 +107,7 @@ static int verify_one_pack(const char *path, int verbose)\n \treturn err;\n }\n \n-static const char verify_pack_usage[] = \"git-verify-pack [-v] <pack>...\";\n+static const char verify_pack_usage[] = \"git verify-pack [-v] <pack>...\";\n \n int cmd_verify_pack(int argc, const char **argv, const char *prefix)\n {\ndiff --git a/merge-index.c b/merge-index.c\nindex 7827e87..a6e1921 100644\n--- a/merge-index.c\n+++ b/merge-index.c\n@@ -91,7 +91,7 @@ int main(int argc, char **argv)\n \tsignal(SIGCHLD, SIG_DFL);\n \n \tif (argc < 3)\n-\t\tusage(\"git-merge-index [-o] [-q] <merge-program> (-a | [--] <filename>*)\");\n+\t\tusage(\"git merge-index [-o] [-q] <merge-program> (-a | [--] <filename>*)\");\n \n \tsetup_git_directory();\n \tread_cache();\ndiff --git a/merge-tree.c b/merge-tree.c\nindex 2d1413e..4f567a4 100644\n--- a/merge-tree.c\n+++ b/merge-tree.c\n@@ -3,7 +3,7 @@\n #include \"xdiff-interface.h\"\n #include \"blob.h\"\n \n-static const char merge_tree_usage[] = \"git-merge-tree <base-tree> <branch1> <branch2>\";\n+static const char merge_tree_usage[] = \"git merge-tree <base-tree> <branch1> <branch2>\";\n static int resolve_directories = 1;\n \n struct merge_list {\ndiff --git a/mktag.c b/mktag.c\nindex ba3d495..9a93ce2 100644\n--- a/mktag.c\n+++ b/mktag.c\n@@ -157,7 +157,7 @@ int main(int argc, char **argv)\n \tunsigned char result_sha1[20];\n \n \tif (argc != 1)\n-\t\tusage(\"git-mktag < signaturefile\");\n+\t\tusage(\"git mktag < signaturefile\");\n \n \tsetup_git_directory();\n \ndiff --git a/mktree.c b/mktree.c\nindex 514fd9b..0f98bc7 100644\n--- a/mktree.c\n+++ b/mktree.c\n@@ -61,7 +61,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[] = \"git-mktree [-z]\";\n+static const char mktree_usage[] = \"git mktree [-z]\";\n \n int main(int ac, char **av)\n {\ndiff --git a/patch-id.c b/patch-id.c\nindex 871f1d2..429c3a2 100644\n--- a/patch-id.c\n+++ b/patch-id.c\n@@ -72,7 +72,7 @@ static void generate_id_list(void)\n \tflush_current_id(patchlen, sha1, &ctx);\n }\n \n-static const char patch_id_usage[] = \"git-patch-id < patch\";\n+static const char patch_id_usage[] = \"git patch-id < patch\";\n \n int main(int argc, char **argv)\n {\ndiff --git a/unpack-file.c b/unpack-file.c\nindex bcdc8bb..75c5f51 100644\n--- a/unpack-file.c\n+++ b/unpack-file.c\n@@ -26,7 +26,7 @@ int main(int argc, char **argv)\n \tunsigned char sha1[20];\n \n \tif (argc != 2)\n-\t\tusage(\"git-unpack-file <sha1>\");\n+\t\tusage(\"git unpack-file <sha1>\");\n \tif (get_sha1(argv[1], sha1))\n \t\tdie(\"Not a valid object name %s\", argv[1]);\n \ndiff --git a/upload-pack.c b/upload-pack.c\nindex e5adbc0..24ab49d 100644\n--- a/upload-pack.c\n+++ b/upload-pack.c\n@@ -11,7 +11,7 @@\n #include \"list-objects.h\"\n #include \"run-command.h\"\n \n-static const char upload_pack_usage[] = \"git-upload-pack [--strict] [--timeout=nn] <dir>\";\n+static const char upload_pack_usage[] = \"git upload-pack [--strict] [--timeout=nn] <dir>\";\n \n /* bits #0..7 in revision.h, #8..10 in commit.c */\n #define THEY_HAVE\t(1u << 11)\n-- \n1.6.0.6\n"}]}