{"thread":{"id":"18983","subject":"[PATCH 2/2] rev-list: remove stringed output flag from \"show_bisect_vars\"","startedAt":"2009-04-21T05:54:10Z","lastAt":"2009-04-21T05:54:10Z","messageCount":1,"participants":["Christian Couder"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"111840","messageId":"20090421055411.4006.28030.chriscool@tuxfamily.org","threadId":"18983","inReplyTo":null,"subject":"[PATCH 2/2] rev-list: remove stringed output flag from \"show_bisect_vars\"","fromName":"Christian Couder","fromEmail":"chriscool@tuxfamily.org","sentAt":"2009-04-21T05:54:10Z","receivedAt":"2009-04-21T05:54:10Z","isPatch":true,"sender":{"key":"christian.couder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/208954?v=4"},"body":"Because it was used only by \"git bisect--helper --next-vars\" but\nthe \"--next-vars\" option has been removed.\n\nSigned-off-by: Christian Couder <chriscool@tuxfamily.org>\n---\n bisect.h           |    1 -\n builtin-rev-list.c |   32 +++++++++++++++-----------------\n 2 files changed, 15 insertions(+), 18 deletions(-)\n\ndiff --git a/bisect.h b/bisect.h\nindex 908e362..0b5d122 100644\n--- a/bisect.h\n+++ b/bisect.h\n@@ -16,7 +16,6 @@ extern void print_commit_list(struct commit_list *list,\n /* bisect_show_flags flags in struct rev_list_info */\n #define BISECT_SHOW_ALL\t\t(1<<0)\n #define BISECT_SHOW_TRIED\t(1<<1)\n-#define BISECT_SHOW_STRINGED\t(1<<2)\n \n struct rev_list_info {\n \tstruct rev_info *revs;\ndiff --git a/builtin-rev-list.c b/builtin-rev-list.c\nindex 35f88ca..31ea5f4 100644\n--- a/builtin-rev-list.c\n+++ b/builtin-rev-list.c\n@@ -235,26 +235,26 @@ void print_commit_list(struct commit_list *list,\n \t}\n }\n \n-static void show_tried_revs(struct commit_list *tried, int stringed)\n+static void show_tried_revs(struct commit_list *tried)\n {\n \tprintf(\"bisect_tried='\");\n \tprint_commit_list(tried, \"%s|\", \"%s\");\n-\tprintf(stringed ? \"' &&\\n\" : \"'\\n\");\n+\tprintf(\"'\\n\");\n }\n \n-static void print_var_str(const char *var, const char *val, int stringed)\n+static void print_var_str(const char *var, const char *val)\n {\n-\tprintf(\"%s='%s'%s\\n\", var, val, stringed ? \" &&\" : \"\");\n+\tprintf(\"%s='%s'\\n\", var, val);\n }\n \n-static void print_var_int(const char *var, int val, int stringed)\n+static void print_var_int(const char *var, int val)\n {\n-\tprintf(\"%s=%d%s\\n\", var, val, stringed ? \" &&\" : \"\");\n+\tprintf(\"%s=%d\\n\", var, val);\n }\n \n int show_bisect_vars(struct rev_list_info *info, int reaches, int all)\n {\n-\tint cnt, stringed, flags = info->bisect_show_flags;\n+\tint cnt, flags = info->bisect_show_flags;\n \tchar hex[41] = \"\";\n \tstruct commit_list *tried;\n \tstruct rev_info *revs = info->revs;\n@@ -285,17 +285,15 @@ int show_bisect_vars(struct rev_list_info *info, int reaches, int all)\n \t\tprintf(\"------\\n\");\n \t}\n \n-\tstringed = flags & BISECT_SHOW_STRINGED;\n-\n \tif (flags & BISECT_SHOW_TRIED)\n-\t\tshow_tried_revs(tried, stringed);\n-\n-\tprint_var_str(\"bisect_rev\", hex, stringed);\n-\tprint_var_int(\"bisect_nr\", cnt - 1, stringed);\n-\tprint_var_int(\"bisect_good\", all - reaches - 1, stringed);\n-\tprint_var_int(\"bisect_bad\", reaches - 1, stringed);\n-\tprint_var_int(\"bisect_all\", all, stringed);\n-\tprint_var_int(\"bisect_steps\", estimate_bisect_steps(all), 0);\n+\t\tshow_tried_revs(tried);\n+\n+\tprint_var_str(\"bisect_rev\", hex);\n+\tprint_var_int(\"bisect_nr\", cnt - 1);\n+\tprint_var_int(\"bisect_good\", all - reaches - 1);\n+\tprint_var_int(\"bisect_bad\", reaches - 1);\n+\tprint_var_int(\"bisect_all\", all);\n+\tprint_var_int(\"bisect_steps\", estimate_bisect_steps(all));\n \n \treturn 0;\n }\n-- \n1.6.2.2.537.g3b83b\n"}]}