summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Couder <chriscool@tuxfamily.org>2009-03-26 04:55:35 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-03-30 08:22:54 (GMT)
commit6a17fad73369173ca71d3adf0d4335a0c8137cb9 (patch)
tree35484c4f79b38209def8022f465b18c11a4e992e
parent9996983c9c35353f352ef7c1abd9b3d2fbb21114 (diff)
downloadgit-6a17fad73369173ca71d3adf0d4335a0c8137cb9.zip
git-6a17fad73369173ca71d3adf0d4335a0c8137cb9.tar.gz
git-6a17fad73369173ca71d3adf0d4335a0c8137cb9.tar.bz2
rev-list: make "show_bisect_vars" non static
and declare it in "bisect.h" as we will use this function later. While at it, rename its last argument "show_all" instead of "bisect_find_all". Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--bisect.h2
-rw-r--r--builtin-rev-list.c5
2 files changed, 5 insertions, 2 deletions
diff --git a/bisect.h b/bisect.h
index 60b2fe1..860a15c 100644
--- a/bisect.h
+++ b/bisect.h
@@ -5,4 +5,6 @@ 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);
+
#endif
diff --git a/builtin-rev-list.c b/builtin-rev-list.c
index 74d22b4..c700c34 100644
--- a/builtin-rev-list.c
+++ b/builtin-rev-list.c
@@ -226,7 +226,7 @@ static int estimate_bisect_steps(int all)
return (e < 3 * x) ? n : n - 1;
}
-static int show_bisect_vars(int reaches, int all, int bisect_find_all)
+int show_bisect_vars(int reaches, int all, int show_all)
{
int cnt;
char hex[41];
@@ -246,9 +246,10 @@ static int show_bisect_vars(int reaches, int all, int bisect_find_all)
cnt = all - reaches;
if (cnt < reaches)
cnt = reaches;
+
strcpy(hex, sha1_to_hex(revs.commits->item->object.sha1));
- if (bisect_find_all) {
+ if (show_all) {
traverse_commit_list(&revs, show_commit, show_object);
printf("------\n");
}