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>
David Ripton committed
Jan 19, 2010 at 07:13 UTC
6329bade6632a9df4b37dd3a7f8d641eed74bbf5
1 file changed
+5
-3
bisect.c
+5
-3
@@ -956,7 +956,7 @@ int bisect_next_all(const char *prefix)
956
{
957
struct rev_info revs;
958
struct commit_list *tried;
959
- int reaches = 0, all = 0, nr;
959
+ int reaches = 0, all = 0, nr, steps;
960
const unsigned char *bisect_rev;
961
char bisect_rev_hex[41];
962
@@ -998,8 +998,10 @@ int bisect_next_all(const char *prefix)
998
}
999
1000
nr = all - reaches - 1;
1001
- printf("Bisecting: %d revisions left to test after this "
1002
- "(roughly %d steps)\n", nr, estimate_bisect_steps(all));
1001
+ steps = estimate_bisect_steps(all);
1002
+ printf("Bisecting: %d revision%s left to test after this "
1003
+ "(roughly %d step%s)\n", nr, (nr == 1 ? "" : "s"),
1004
+ steps, (steps == 1 ? "" : "s"));
1005
1006
return bisect_checkout(bisect_rev_hex);
1007
}