summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6f9752d)
raw | patch | inline | side by side (parent: 6f9752d)
author | David Ripton <dripton@ripton.net> | |
Tue, 19 Jan 2010 15:13:33 +0000 (07:13 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Tue, 19 Jan 2010 20:50:48 +0000 (12:50 -0800) |
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>
only one.
Signed-off-by: David Ripton <dripton@ripton.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
bisect.c | patch | blob | history |
diff --git a/bisect.c b/bisect.c
index dc18db8af96b093d7cb16eb88d3f738f98dc30f6..b779a9589aae28ed8e92ca64309fb62936480e9d 100644 (file)
--- a/bisect.c
+++ b/bisect.c
{
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];
}
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);
}