From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 6 Jun 2014 18:21:47 +0000 (-0700)
Subject: Merge branch 'fc/status-printf-squelch-format-zero-length-warnings'
X-Git-Tag: v2.1.0-rc0~170
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/09e141f12790676d2b0297c0d5f1ca9e27140480?hp=--cc

Merge branch 'fc/status-printf-squelch-format-zero-length-warnings'

* fc/status-printf-squelch-format-zero-length-warnings:
silence a bunch of format-zero-length warnings
---

09e141f12790676d2b0297c0d5f1ca9e27140480
diff --cc builtin/commit.c
index 0320efd57d,377d8418d2..d28505a857
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@@ -842,13 -800,12 +842,13 @@@ static int prepare_to_commit(const cha
  		if (!committer_ident_sufficiently_given())
  			status_printf_ln(s, GIT_COLOR_NORMAL,
  				_("%s"
 -				"Committer: %s"),
 +				"Committer: %.*s <%.*s>"),
  				ident_shown++ ? "" : "\n",
 -				committer_ident.buf);
 +				(int)(ci.name_end - ci.name_begin), ci.name_begin,
 +				(int)(ci.mail_end - ci.mail_begin), ci.mail_begin);
  
  		if (ident_shown)
- 			status_printf_ln(s, GIT_COLOR_NORMAL, "");
+ 			status_printf_ln(s, GIT_COLOR_NORMAL, "%s", "");
  
  		saved_color_setting = s->use_color;
  		s->use_color = 0;