undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* maint:
  bisect: fix singular/plural grammar nit
This commit is contained in:
Junio C Hamano 2010-01-19 16:57:10 -08:00
commit 5b15950ac4
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bisect.c
View File

@ -956,7 +956,7 @@ int bisect_next_all(const char *prefix)
{ {
struct rev_info revs; struct rev_info revs;
struct commit_list *tried; struct commit_list *tried;
int reaches = 0, all = 0, nr; int reaches = 0, all = 0, nr, steps;
const unsigned char *bisect_rev; const unsigned char *bisect_rev;
char bisect_rev_hex[41]; char bisect_rev_hex[41];
@ -998,8 +998,10 @@ int bisect_next_all(const char *prefix)
} }
nr = all - reaches - 1; nr = all - reaches - 1;
printf("Bisecting: %d revisions left to test after this " steps = estimate_bisect_steps(all);
"(roughly %d steps)\n", nr, 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); return bisect_checkout(bisect_rev_hex);
} }