From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 20 Jan 2010 00:57:10 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.0-rc0~79
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/5b15950ac414a8a2d4f5eb480712abcc9fe176d2?ds=inline;hp=-c

Merge branch 'maint'

* maint:
bisect: fix singular/plural grammar nit
---

5b15950ac414a8a2d4f5eb480712abcc9fe176d2
diff --combined bisect.c
index f1a1f84aa0,b779a9589a..3d04d2a0bb
--- a/bisect.c
+++ b/bisect.c
@@@ -813,11 -813,11 +813,11 @@@ static void handle_skipped_merge_base(c
  	char *bad_hex = sha1_to_hex(current_bad_sha1);
  	char *good_hex = join_sha1_array_hex(&good_revs, ' ');
  
 -	fprintf(stderr, "Warning: the merge base between %s and [%s] "
 +	warning("the merge base between %s and [%s] "
  		"must be skipped.\n"
  		"So we cannot be sure the first bad commit is "
  		"between %s and %s.\n"
 -		"We continue anyway.\n",
 +		"We continue anyway.",
  		bad_hex, good_hex, mb_hex, bad_hex);
  	free(good_hex);
  }
@@@ -956,7 -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 +998,10 @@@
  	}
  
  	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);
  }