{"thread":{"id":"17497","subject":"[PATCH 4/4] builtin-replace: use \"usage_msg_opt\" to give better error messages","startedAt":"2009-02-02T05:13:06Z","lastAt":"2009-02-02T05:13:06Z","messageCount":1,"participants":["Christian Couder"],"isPatch":true,"patchVersion":1,"patchTotal":4},"messages":[{"id":"102820","messageId":"20090202061306.d7eaa24f.chriscool@tuxfamily.org","threadId":"17497","inReplyTo":null,"subject":"[PATCH 4/4] builtin-replace: use \"usage_msg_opt\" to give better error messages","fromName":"Christian Couder","fromEmail":"chriscool@tuxfamily.org","sentAt":"2009-02-02T05:13:06Z","receivedAt":"2009-02-02T05:13:06Z","isPatch":true,"sender":{"key":"christian.couder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/208954?v=4"},"body":"Signed-off-by: Christian Couder <chriscool@tuxfamily.org>\n---\n builtin-replace.c |   18 ++++++++++++------\n 1 files changed, 12 insertions(+), 6 deletions(-)\n\ndiff --git a/builtin-replace.c b/builtin-replace.c\nindex e3767b9..b15f709 100644\n--- a/builtin-replace.c\n+++ b/builtin-replace.c\n@@ -124,30 +124,36 @@ int cmd_replace(int argc, const char **argv, const char *prefix)\n \targc = parse_options(argc, argv, options, git_replace_usage, 0);\n \n \tif (list && delete)\n-\t\tusage_with_options(git_replace_usage, options);\n+\t\tusage_msg_opt(\"-l and -d cannot be used together\",\n+\t\t\t      git_replace_usage, options);\n \n \tif (force && (list || delete))\n-\t\tusage_with_options(git_replace_usage, options);\n+\t\tusage_msg_opt(\"-f cannot be used with -d or -l\",\n+\t\t\t      git_replace_usage, options);\n \n \t/* Delete refs */\n \tif (delete) {\n \t\tif (argc < 1)\n-\t\t\tusage_with_options(git_replace_usage, options);\n+\t\t\tusage_msg_opt(\"-d needs at least one argument\",\n+\t\t\t\t      git_replace_usage, options);\n \t\treturn for_each_replace_name(argv, delete_replace_ref);\n \t}\n \n \t/* Replace object */\n \tif (!list && argc) {\n \t\tif (argc != 2)\n-\t\t\tusage_with_options(git_replace_usage, options);\n+\t\t\tusage_msg_opt(\"bad number of arguments\",\n+\t\t\t\t      git_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_with_options(git_replace_usage, options);\n+\t\tusage_msg_opt(\"only one pattern can be given with -l\",\n+\t\t\t      git_replace_usage, options);\n \tif (force)\n-\t\tusage_with_options(git_replace_usage, options);\n+\t\tusage_msg_opt(\"-f needs some arguments\",\n+\t\t\t      git_replace_usage, options);\n \n \treturn list_replace_refs(argv[0]);\n }\n-- \n1.6.1.2.353.g99fdd.dirty\n"}]}