From 2ace9727be2b04ce9fbc5939466da38be7fd8496 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Sun, 19 Apr 2009 11:55:57 +0200 Subject: [PATCH] bisect: move common bisect functionality to "bisect_common" So we can easily reuse the code in a later patch. Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano --- bisect.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/bisect.c b/bisect.c index 58f7e6f773..0448eae3f8 100644 --- a/bisect.c +++ b/bisect.c @@ -532,6 +532,20 @@ static void bisect_rev_setup(struct rev_info *revs, const char *prefix) revs->limited = 1; } +static void bisect_common(struct rev_info *revs, const char *prefix, + int *reaches, int *all) +{ + bisect_rev_setup(revs, prefix); + + if (prepare_revision_walk(revs)) + die("revision walk setup failed"); + if (revs->tree_objects) + mark_edges_uninteresting(revs->commits, revs, NULL); + + revs->commits = find_bisection(revs->commits, reaches, all, + !!skipped_sha1_nr); +} + int bisect_next_vars(const char *prefix) { struct rev_info revs; @@ -542,15 +556,7 @@ int bisect_next_vars(const char *prefix) info.revs = &revs; info.bisect_show_flags = BISECT_SHOW_TRIED | BISECT_SHOW_STRINGED; - bisect_rev_setup(&revs, prefix); - - if (prepare_revision_walk(&revs)) - die("revision walk setup failed"); - if (revs.tree_objects) - mark_edges_uninteresting(revs.commits, &revs, NULL); - - revs.commits = find_bisection(revs.commits, &reaches, &all, - !!skipped_sha1_nr); + bisect_common(&revs, prefix, &reaches, &all); return show_bisect_vars(&info, reaches, all); } -- 2.11.4.GIT