summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Ripton <dripton@ripton.net>2010-01-19 15:13:33 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-01-19 20:50:48 (GMT)
commit6329bade6632a9df4b37dd3a7f8d641eed74bbf5 (patch)
treeb1d5ca733865299e9af6dcc5ed29bd34da213556
parent6f9752d2e29ecbd5d9489e57bfcd28fb030cba97 (diff)
downloadgit-6329bade6632a9df4b37dd3a7f8d641eed74bbf5.zip
git-6329bade6632a9df4b37dd3a7f8d641eed74bbf5.tar.gz
git-6329bade6632a9df4b37dd3a7f8d641eed74bbf5.tar.bz2
bisect: fix singular/plural grammar nit
Remove the trailing 's' from "revisions" and "steps" when there is only one. Signed-off-by: David Ripton <dripton@ripton.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--bisect.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/bisect.c b/bisect.c
index dc18db8..b779a95 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);
}