rev-list: remove BISECT_SHOW_TRIED flag

Since c99f069 (bisect--helper: remove "--next-vars" option as it is
now useless - 2009-04-21), this flag has always been off. Remove the
flag and all related code.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/bisect.h b/bisect.h
index 22f2e4db2d1d05184dc2eeec2ff87021a67e01f2..b06949e9dbe73531027548215e7863b43ad57c62 100644 (file)
--- a/bisect.h
+++ b/bisect.h
@@ -17,7 +17,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)
 
 /* bisect_show_flags flags in struct rev_list_info */
 #define BISECT_SHOW_ALL                (1<<0)

-#define BISECT_SHOW_TRIED      (1<<1)

 
 struct rev_list_info {
        struct rev_info *revs;
 
 struct rev_list_info {
        struct rev_info *revs;

diff --git a/builtin/rev-list.c b/builtin/rev-list.c
index 264e3ae9d840c342499634e21b21c274ebcebacf..7a3f8205e2899b25812df654936435334f8ab791 100644 (file)
--- a/builtin/rev-list.c
+++ b/builtin/rev-list.c
@@ -242,13 +242,6 @@ void print_commit_list(struct commit_list *list,
        }
 }
 
        }
 }
 

-static void show_tried_revs(struct commit_list *tried)
-{
-       printf("bisect_tried='");
-       print_commit_list(tried, "%s|", "%s");
-       printf("'\n");
-}
-

 static void print_var_str(const char *var, const char *val)
 {
        printf("%s='%s'\n", var, val);
 static void print_var_str(const char *var, const char *val)
 {
        printf("%s='%s'\n", var, val);


@@ -266,7 +259,7 @@ static int show_bisect_vars(struct rev_list_info *info, int reaches, int all)
        struct commit_list *tried;
        struct rev_info *revs = info->revs;
 
        struct commit_list *tried;
        struct rev_info *revs = info->revs;
 

-       if (!revs->commits && !(flags & BISECT_SHOW_TRIED))
+       if (!revs->commits)

                return 1;
 
        revs->commits = filter_skipped(revs->commits, &tried,
                return 1;
 
        revs->commits = filter_skipped(revs->commits, &tried,


@@ -294,9 +287,6 @@ static int show_bisect_vars(struct rev_list_info *info, int reaches, int all)
                printf("------\n");
        }
 
                printf("------\n");
        }
 

-       if (flags & BISECT_SHOW_TRIED)
-               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_str("bisect_rev", hex);
        print_var_int("bisect_nr", cnt - 1);
        print_var_int("bisect_good", all - reaches - 1);