From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 16 Mar 2017 20:56:43 +0000 (-0700)
Subject: Merge branch 'mm/two-more-xstrfmt' into maint
X-Git-Tag: v2.12.1~3
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f989ac276d310564364482979a78b83d113c4044?ds=inline;hp=-c

Merge branch 'mm/two-more-xstrfmt' into maint

Code clean-up and a string truncation fix.

* mm/two-more-xstrfmt:
bisect_next_all: convert xsnprintf to xstrfmt
stop_progress_msg: convert xsnprintf to xstrfmt
---

f989ac276d310564364482979a78b83d113c4044
diff --combined bisect.c
index 8e63c40d27,787543cadc..30808cadf7
--- a/bisect.c
+++ b/bisect.c
@@@ -747,7 -747,7 +747,7 @@@ static void handle_bad_merge_base(void
  		exit(3);
  	}
  
 -	fprintf(stderr, _("Some %s revs are not ancestor of the %s rev.\n"
 +	fprintf(stderr, _("Some %s revs are not ancestors of the %s rev.\n"
  		"git bisect cannot work properly in this case.\n"
  		"Maybe you mistook %s and %s revs?\n"),
  		term_good, term_bad, term_good, term_bad);
@@@ -940,7 -940,7 +940,7 @@@ int bisect_next_all(const char *prefix
  	struct commit_list *tried;
  	int reaches = 0, all = 0, nr, steps;
  	const unsigned char *bisect_rev;
- 	char steps_msg[32];
+ 	char *steps_msg;
  
  	read_bisect_terms(&term_bad, &term_good);
  	if (read_bisect_refs())
@@@ -990,14 -990,15 +990,15 @@@
  
  	nr = all - reaches - 1;
  	steps = estimate_bisect_steps(all);
- 	xsnprintf(steps_msg, sizeof(steps_msg),
- 		  Q_("(roughly %d step)", "(roughly %d steps)", steps),
- 		  steps);
+ 
+ 	steps_msg = xstrfmt(Q_("(roughly %d step)", "(roughly %d steps)",
+ 		  steps), steps);
  	/* TRANSLATORS: the last %s will be replaced with
  	   "(roughly %d steps)" translation */
  	printf(Q_("Bisecting: %d revision left to test after this %s\n",
  		  "Bisecting: %d revisions left to test after this %s\n",
  		  nr), nr, steps_msg);
+ 	free(steps_msg);
  
  	return bisect_checkout(bisect_rev, no_checkout);
  }