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@xxxxxxxxxxxxx>
---
bisect.h | 1 -
builtin-rev-list.c | 32 +++++++++++++++-----------------
2 files changed, 15 insertions(+), 18 deletions(-)
diff --git a/bisect.h b/bisect.h
index 908e362..0b5d122 100644
--- 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 35f88ca..31ea5f4 100644
--- 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;
}
--
1.6.2.2.537.g3b83b
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html