From: Christian Couder <chriscool@tuxfamily.org>
Date: Thu, 26 Mar 2009 04:55:41 +0000 (+0100)
Subject: rev-list: pass "revs" to "show_bisect_vars"
X-Git-Tag: v1.6.3-rc0~7^2~12
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=7428d754e2dec9e82253d1e02b4df20fab3f3384;p=git.git

rev-list: pass "revs" to "show_bisect_vars"

instead of using static "revs" data

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 860a15c9b..31c99fe5f 100644
--- a/bisect.h
+++ b/bisect.h
@@ -5,6 +5,7 @@ extern struct commit_list *find_bisection(struct commit_list *list,
 					  int *reaches, int *all,
 					  int find_all);
 
-extern int show_bisect_vars(int reaches, int all, int show_all);
+extern int show_bisect_vars(struct rev_info *revs, int reaches, int all,
+			    int show_all);
 
 #endif
diff --git a/builtin-rev-list.c b/builtin-rev-list.c
index c700c34be..cdb0f9d91 100644
--- a/builtin-rev-list.c
+++ b/builtin-rev-list.c
@@ -226,16 +226,16 @@ static int estimate_bisect_steps(int all)
 	return (e < 3 * x) ? n : n - 1;
 }
 
-int show_bisect_vars(int reaches, int all, int show_all)
+int show_bisect_vars(struct rev_info *revs, int reaches, int all, int show_all)
 {
 	int cnt;
 	char hex[41];
 
-	if (!revs.commits)
+	if (!revs->commits)
 		return 1;
 
 	/*
-	 * revs.commits can reach "reaches" commits among
+	 * revs->commits can reach "reaches" commits among
 	 * "all" commits.  If it is good, then there are
 	 * (all-reaches) commits left to be bisected.
 	 * On the other hand, if it is bad, then the set
@@ -247,10 +247,10 @@ int show_bisect_vars(int reaches, int all, int show_all)
 	if (cnt < reaches)
 		cnt = reaches;
 
-	strcpy(hex, sha1_to_hex(revs.commits->item->object.sha1));
+	strcpy(hex, sha1_to_hex(revs->commits->item->object.sha1));
 
 	if (show_all) {
-		traverse_commit_list(&revs, show_commit, show_object);
+		traverse_commit_list(revs, show_commit, show_object);
 		printf("------\n");
 	}
 
@@ -358,7 +358,8 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
 		revs.commits = find_bisection(revs.commits, &reaches, &all,
 					      bisect_find_all);
 		if (bisect_show_vars)
-			return show_bisect_vars(reaches, all, bisect_find_all);
+			return show_bisect_vars(&revs, reaches, all,
+						bisect_find_all);
 	}
 
 	traverse_commit_list(&revs,