summaryrefslogtreecommitdiff
path: root/bisect.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-01-20 00:57:10 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-01-20 00:57:10 (GMT)
commit5b15950ac414a8a2d4f5eb480712abcc9fe176d2 (patch)
treeb2853f6755b398dec1380117f60fe6c9b30aada7 /bisect.c
parent4256f36c58238a1b2317372b37be889d75a93198 (diff)
parent6329bade6632a9df4b37dd3a7f8d641eed74bbf5 (diff)
downloadgit-5b15950ac414a8a2d4f5eb480712abcc9fe176d2.zip
git-5b15950ac414a8a2d4f5eb480712abcc9fe176d2.tar.gz
git-5b15950ac414a8a2d4f5eb480712abcc9fe176d2.tar.bz2
Merge branch 'maint'
* maint: bisect: fix singular/plural grammar nit
Diffstat (limited to 'bisect.c')
-rw-r--r--bisect.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/bisect.c b/bisect.c
index f1a1f84..3d04d2a 100644
--- a/bisect.c
+++ b/bisect.c
@@ -956,7 +956,7 @@ int bisect_next_all(const char *prefix)
{
struct rev_info revs;
struct commit_list *tried;
- int reaches = 0, all = 0, nr;
+ int reaches = 0, all = 0, nr, steps;
const unsigned char *bisect_rev;
char bisect_rev_hex[41];
@@ -998,8 +998,10 @@ int bisect_next_all(const char *prefix)
}
nr = all - reaches - 1;
- printf("Bisecting: %d revisions left to test after this "
- "(roughly %d steps)\n", nr, estimate_bisect_steps(all));
+ steps = estimate_bisect_steps(all);
+ printf("Bisecting: %d revision%s left to test after this "
+ "(roughly %d step%s)\n", nr, (nr == 1 ? "" : "s"),
+ steps, (steps == 1 ? "" : "s"));
return bisect_checkout(bisect_rev_hex);
}