Merge branch 'fc/status-printf-squelch-format-zero-length-warnings'
authorJunio C Hamano <gitster@pobox.com>
Fri, 6 Jun 2014 18:21:47 +0000 (11:21 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 6 Jun 2014 18:21:47 +0000 (11:21 -0700)
* fc/status-printf-squelch-format-zero-length-warnings:
silence a bunch of format-zero-length warnings

1  2 
builtin/commit.c
wt-status.c
index 0320efd57d51d3bf78bedd958b895e5a44fca640,377d8418d2496b6e7ccb1317815310a6638da5a0..d28505a857dad9e897896473a88e05f32f56bfb2
@@@ -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;
diff --cc wt-status.c
Simple merge