diff options
| author | Maxim Moseychuk <franchesko.salias.hudro.pedros@gmail.com> | 2017-02-16 20:07:12 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-02-16 11:28:17 -0800 |
| commit | 2cfa83574c4b2685208a1e6062fdc573c887cf00 (patch) | |
| tree | 6819b56f07d0d5cafd5eaf81bddaaa8254ff53c0 /bisect.c | |
| parent | fbd09439c097123346d9823b88c87438bf5a11ae (diff) | |
| download | git-2cfa83574c4b2685208a1e6062fdc573c887cf00.tar.gz | |
bisect_next_all: convert xsnprintf to xstrfmtmm/two-more-xstrfmt
Git can't run bisect between 2048+ commits if use russian
translation, because the translated string is too long for the fixed
buffer it uses (this can be reproduced "LANG=ru_RU.UTF8 git bisect
start v4.9 v4.8" on linux sources).
Use xstrfmt() to format the message string to sufficiently sized
buffer instead to fix this.
Signed-off-by: Maxim Moseychuk <franchesko.salias.hudro.pedros@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'bisect.c')
| -rw-r--r-- | bisect.c | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -940,7 +940,7 @@ int bisect_next_all(const char *prefix, int no_checkout) 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 @@ int bisect_next_all(const char *prefix, int no_checkout) 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); } |