rev-list: remove stringed output flag from "show_bisect_vars"

Because it was used only by "git bisect--helper --next-vars" but
the "--next-vars" option has been removed.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/bisect.h b/bisect.h
index 908e362f8b88c6f9da471042242ade099266a4ac..0b5d122a7b2dbe9778c35ee79d8a256980da53f6 100644 (file)
--- a/bisect.h
+++ b/bisect.h
@@ -16,7 +16,6 @@ extern void print_commit_list(struct commit_list *list,
 /* bisect_show_flags flags in struct rev_list_info */
 #define BISECT_SHOW_ALL                (1<<0)
 #define BISECT_SHOW_TRIED      (1<<1)
-#define BISECT_SHOW_STRINGED   (1<<2)
 
 struct rev_list_info {
        struct rev_info *revs;

diff --git a/builtin-rev-list.c b/builtin-rev-list.c
index 35f88ca425f8c960a7c1d76a18191c92fc118125..31ea5f4aac4559a69ed5b0033696fff2333f5e5a 100644 (file)
--- a/builtin-rev-list.c
+++ b/builtin-rev-list.c
@@ -235,26 +235,26 @@ void print_commit_list(struct commit_list *list,
        }
 }
 
-static void show_tried_revs(struct commit_list *tried, int stringed)
+static void show_tried_revs(struct commit_list *tried)
 {
        printf("bisect_tried='");
        print_commit_list(tried, "%s|", "%s");
-       printf(stringed ? "' &&\n" : "'\n");
+       printf("'\n");
 }
 
-static void print_var_str(const char *var, const char *val, int stringed)
+static void print_var_str(const char *var, const char *val)
 {
-       printf("%s='%s'%s\n", var, val, stringed ? " &&" : "");
+       printf("%s='%s'\n", var, val);
 }
 
-static void print_var_int(const char *var, int val, int stringed)
+static void print_var_int(const char *var, int val)
 {
-       printf("%s=%d%s\n", var, val, stringed ? " &&" : "");
+       printf("%s=%d\n", var, val);
 }
 
 int show_bisect_vars(struct rev_list_info *info, int reaches, int all)
 {
-       int cnt, stringed, flags = info->bisect_show_flags;
+       int cnt, flags = info->bisect_show_flags;
        char hex[41] = "";
        struct commit_list *tried;
        struct rev_info *revs = info->revs;
@@ -285,17 +285,15 @@ int show_bisect_vars(struct rev_list_info *info, int reaches, int all)
                printf("------\n");
        }
 
-       stringed = flags & BISECT_SHOW_STRINGED;
-
        if (flags & BISECT_SHOW_TRIED)
-               show_tried_revs(tried, stringed);
-
-       print_var_str("bisect_rev", hex, stringed);
-       print_var_int("bisect_nr", cnt - 1, stringed);
-       print_var_int("bisect_good", all - reaches - 1, stringed);
-       print_var_int("bisect_bad", reaches - 1, stringed);
-       print_var_int("bisect_all", all, stringed);
-       print_var_int("bisect_steps", estimate_bisect_steps(all), 0);
+               show_tried_revs(tried);
+
+       print_var_str("bisect_rev", hex);
+       print_var_int("bisect_nr", cnt - 1);
+       print_var_int("bisect_good", all - reaches - 1);
+       print_var_int("bisect_bad", reaches - 1);
+       print_var_int("bisect_all", all);
+       print_var_int("bisect_steps", estimate_bisect_steps(all));
 
        return 0;
 }