{"thread":{"id":"18984","subject":"[PATCH 1/2] bisect--helper: remove \"--next-vars\" option as it is now useless","startedAt":"2009-04-21T05:54:09Z","lastAt":"2009-04-21T05:54:09Z","messageCount":1,"participants":["Christian Couder"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"111841","messageId":"20090421055411.4006.85356.chriscool@tuxfamily.org","threadId":"18984","inReplyTo":null,"subject":"[PATCH 1/2] bisect--helper: remove \"--next-vars\" option as it is now useless","fromName":"Christian Couder","fromEmail":"chriscool@tuxfamily.org","sentAt":"2009-04-21T05:54:09Z","receivedAt":"2009-04-21T05:54:09Z","isPatch":true,"sender":{"key":"christian.couder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/208954?v=4"},"body":"Because it has been replaced by \"--next-exit\".\n\nSigned-off-by: Christian Couder <chriscool@tuxfamily.org>\n---\n bisect.c                 |   15 ---------------\n bisect.h                 |    1 -\n builtin-bisect--helper.c |   12 +++---------\n 3 files changed, 3 insertions(+), 25 deletions(-)\n\ndiff --git a/bisect.c b/bisect.c\nindex f6e1378..47ad58b 100644\n--- a/bisect.c\n+++ b/bisect.c\n@@ -554,21 +554,6 @@ static void bisect_common(struct rev_info *revs, const char *prefix,\n \t\t\t\t       !!skipped_sha1_nr);\n }\n \n-int bisect_next_vars(const char *prefix)\n-{\n-\tstruct rev_info revs;\n-\tstruct rev_list_info info;\n-\tint reaches = 0, all = 0;\n-\n-\tmemset(&info, 0, sizeof(info));\n-\tinfo.revs = &revs;\n-\tinfo.bisect_show_flags = BISECT_SHOW_TRIED | BISECT_SHOW_STRINGED;\n-\n-\tbisect_common(&revs, prefix, &reaches, &all);\n-\n-\treturn show_bisect_vars(&info, reaches, all);\n-}\n-\n static void exit_if_skipped_commits(struct commit_list *tried,\n \t\t\t\t    const unsigned char *bad)\n {\ndiff --git a/bisect.h b/bisect.h\nindex 028eb85..908e362 100644\n--- a/bisect.h\n+++ b/bisect.h\n@@ -28,7 +28,6 @@ struct rev_list_info {\n \n extern int show_bisect_vars(struct rev_list_info *info, int reaches, int all);\n \n-extern int bisect_next_vars(const char *prefix);\n extern int bisect_next_exit(const char *prefix);\n \n extern int estimate_bisect_steps(int all);\ndiff --git a/builtin-bisect--helper.c b/builtin-bisect--helper.c\nindex cb86a9a..aca7018 100644\n--- a/builtin-bisect--helper.c\n+++ b/builtin-bisect--helper.c\n@@ -4,18 +4,14 @@\n #include \"bisect.h\"\n \n static const char * const git_bisect_helper_usage[] = {\n-\t\"git bisect--helper --next-vars\",\n \t\"git bisect--helper --next-exit\",\n \tNULL\n };\n \n int cmd_bisect__helper(int argc, const char **argv, const char *prefix)\n {\n-\tint next_vars = 0;\n \tint next_exit = 0;\n \tstruct option options[] = {\n-\t\tOPT_BOOLEAN(0, \"next-vars\", &next_vars,\n-\t\t\t    \"output next bisect step variables\"),\n \t\tOPT_BOOLEAN(0, \"next-exit\", &next_exit,\n \t\t\t    \"output bisect result and exit instuctions\"),\n \t\tOPT_END()\n@@ -23,11 +19,9 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix)\n \n \targc = parse_options(argc, argv, options, git_bisect_helper_usage, 0);\n \n-\tif ((next_vars && next_exit) || (!next_vars && !next_exit))\n+\tif (!next_exit)\n \t\tusage_with_options(git_bisect_helper_usage, options);\n \n-\tif (next_vars)\n-\t\treturn bisect_next_vars(prefix);\n-\telse /* next-exit */\n-\t\treturn bisect_next_exit(prefix);\n+\t/* next-exit */\n+\treturn bisect_next_exit(prefix);\n }\n-- \n1.6.2.2.537.g3b83b\n"}]}