{"thread":{"id":"22290","subject":"[PATCH] bisect: fix singular/plural grammar nit","startedAt":"2010-01-19T15:13:33Z","lastAt":"2010-01-19T20:53:39Z","messageCount":2,"participants":["David Ripton","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"132111","messageId":"20100119151333.GA9660@vidar.dreamhost.com","threadId":"22290","inReplyTo":null,"subject":"[PATCH] bisect: fix singular/plural grammar nit","fromName":"David Ripton","fromEmail":"dripton@ripton.net","sentAt":"2010-01-19T15:13:33Z","receivedAt":"2010-01-19T15:13:33Z","isPatch":true,"sender":{"key":"dripton@ripton.net","avatar":"https://avatars.githubusercontent.com/u/153528?v=4"},"body":"Remove the trailing 's' from \"revisions\" and \"steps\" when there is\nonly one.\n\nSigned-off-by: David Ripton <dripton@ripton.net>\n---\n bisect.c |    8 +++++---\n 1 files changed, 5 insertions(+), 3 deletions(-)\n\ndiff --git a/bisect.c b/bisect.c\nindex f1a1f84..af280b4 100644\n--- a/bisect.c\n+++ b/bisect.c\n@@ -956,7 +956,7 @@ int bisect_next_all(const char *prefix)\n {\n \tstruct rev_info revs;\n \tstruct commit_list *tried;\n-\tint reaches = 0, all = 0, nr;\n+\tint reaches = 0, all = 0, nr, steps;\n \tconst unsigned char *bisect_rev;\n \tchar bisect_rev_hex[41];\n \n@@ -998,8 +998,10 @@ int bisect_next_all(const char *prefix)\n \t}\n \n \tnr = all - reaches - 1;\n-\tprintf(\"Bisecting: %d revisions left to test after this \"\n-\t       \"(roughly %d steps)\\n\", nr, estimate_bisect_steps(all));\n+\tsteps = estimate_bisect_steps(all);\n+\tprintf(\"Bisecting: %d revision%s left to test after this \"\n+\t       \"(roughly %d step%s)\\n\", nr, (nr == 1 ? \"\" : \"s\"),\n+               steps, (steps == 1 ? \"\" : \"s\"));\n \n \treturn bisect_checkout(bisect_rev_hex);\n }\n\n-- \nDavid Ripton    dripton@ripton.net\n"},{"id":"132139","messageId":"7vpr5595po.fsf@alter.siamese.dyndns.org","threadId":"22290","inReplyTo":"20100119151333.GA9660@vidar.dreamhost.com","subject":"Re: [PATCH] bisect: fix singular/plural grammar nit","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2010-01-19T20:53:39Z","receivedAt":"2010-01-19T20:53:39Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"David Ripton <dripton@ripton.net> writes:\n\n> Remove the trailing 's' from \"revisions\" and \"steps\" when there is\n> only one.\n\nThanks; will apply to 'maint'.\n"}]}