From: David Ripton <dripton@ripton.net>
To: git@vger.kernel.org, gitster@pobox.com
Subject: [PATCH] bisect: fix singular/plural grammar nit
Date: Tue, 19 Jan 2010 07:13:33 -0800 [thread overview]
Message-ID: <20100119151333.GA9660@vidar.dreamhost.com> (raw)
Remove the trailing 's' from "revisions" and "steps" when there is
only one.
Signed-off-by: David Ripton <dripton@ripton.net>
---
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
next reply other threads:[~2010-01-19 15:41 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-19 15:13 David Ripton [this message]
2010-01-19 20:53 ` [PATCH] bisect: fix singular/plural grammar nit Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100119151333.GA9660@vidar.dreamhost.com \
--to=dripton@ripton.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).