submodule, repack: migrate to git-sh-setup's say()

diff --git a/builtin-rev-list.c b/builtin-rev-list.c
index 35f88ca425f8c960a7c1d76a18191c92fc118125..4ba1c12e0b6fedb056aebed6ffc8f8bb8d6cfd18 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;
@@ -262,7 +262,9 @@ int show_bisect_vars(struct rev_list_info *info, int reaches, int all)
        if (!revs->commits && !(flags & BISECT_SHOW_TRIED))
                return 1;
 
-       revs->commits = filter_skipped(revs->commits, &tried, flags & BISECT_SHOW_ALL);
+       revs->commits = filter_skipped(revs->commits, &tried,
+                                      flags & BISECT_SHOW_ALL,
+                                      NULL, NULL);
 
        /*
         * revs->commits can reach "reaches" commits among
@@ -285,17 +287,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;
 }