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

diff --combined bisect.c
index 8e63c40d274d7693b0c41e702cbe9ed03b1d12ae,787543cadc8013022279b6382699d075f153642e..30808cadf7613d73cae2e4caaedd922ba9a48ca0
--- 1/bisect.c
--- 2/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);
  }