# [PATCH] bisect: fix singular/plural grammar nit 2 messages from 2010-01-19 to 2010-01-19. Participants: David Ripton, Junio C Hamano. Thread: https://gitlist.dev/t/22290 ## David Ripton, 2010-01-19 15:13 Subject: [PATCH] bisect: fix singular/plural grammar nit Message-ID: <20100119151333.GA9660@vidar.dreamhost.com> URL: https://gitlist.dev/e/20100119151333.GA9660%40vidar.dreamhost.com ``` Remove the trailing 's' from "revisions" and "steps" when there is only one. Signed-off-by: David Ripton --- bisect.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/bisect.c b/bisect.c index f1a1f84..af280b4 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); } -- David Ripton dripton@ripton.net ``` ## Junio C Hamano, 2010-01-19 20:53 Subject: Re: [PATCH] bisect: fix singular/plural grammar nit Message-ID: <7vpr5595po.fsf@alter.siamese.dyndns.org> URL: https://gitlist.dev/e/7vpr5595po.fsf%40alter.siamese.dyndns.org In-Reply-To: <20100119151333.GA9660@vidar.dreamhost.com> ``` David Ripton writes: > Remove the trailing 's' from "revisions" and "steps" when there is > only one. Thanks; will apply to 'maint'. ```