From 6329bade6632a9df4b37dd3a7f8d641eed74bbf5 Mon Sep 17 00:00:00 2001 From: David Ripton Date: Tue, 19 Jan 2010 07:13:33 -0800 Subject: [PATCH] bisect: fix singular/plural grammar nit Remove the trailing 's' from "revisions" and "steps" when there is only one. Signed-off-by: David Ripton Signed-off-by: Junio C Hamano --- bisect.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/bisect.c b/bisect.c index dc18db8af9..b779a9589a 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); }