bisect: fix singular/plural grammar nit

dripton · gitster · commit 6329bade6632 · 2010-01-19T12:50:48.000-08:00
Remove the trailing 's' from "revisions" and "steps" when there is
only one.

Signed-off-by: David Ripton &lt;dripton@ripton.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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);
 }

Original file line number	Diff line number	Diff line change
`@@ -956,7 +956,7 @@ int bisect_next_all(const char *prefix)`
`956`	`956`	`{`
`957`	`957`	`struct rev_info revs;`
`958`	`958`	`struct commit_list *tried;`
`959`		`- int reaches = 0, all = 0, nr;`
	`959`	`+ int reaches = 0, all = 0, nr, steps;`
`960`	`960`	`const unsigned char *bisect_rev;`
`961`	`961`	`char bisect_rev_hex[41];`
`962`	`962`
`@@ -998,8 +998,10 @@ int bisect_next_all(const char *prefix)`
`998`	`998`	`}`
`999`	`999`
`1000`	`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"));`
`1003`	`1005`
`1004`	`1006`	`return bisect_checkout(bisect_rev_hex);`
`1005`	`1007`	`}`