diff options
| author | Michael J Gruber <git@grubix.eu> | 2017-03-27 18:50:05 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-03-27 13:45:23 -0700 |
| commit | 646c3bd1ad59ab4aea2718d89c8eb9ce8cfa83bf (patch) | |
| tree | 140a4b9fd663c6debec67f908451c9ed9f42cd30 | |
| parent | e0ef7fe78c46e6919d249b9547948a3bb7321dea (diff) | |
| download | git-646c3bd1ad59ab4aea2718d89c8eb9ce8cfa83bf.tar.gz | |
describe: localize debug output fully
git describe --debug localizes all debug messages but not the terms
head, lightweight, annotated that it outputs for the candidates.
Localize them, too.
Signed-off-by: Michael J Gruber <git@grubix.eu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/describe.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/builtin/describe.c b/builtin/describe.c index 45adbf67d5..a5cd8c513f 100644 --- a/builtin/describe.c +++ b/builtin/describe.c @@ -50,7 +50,7 @@ struct commit_name { }; static const char *prio_names[] = { - "head", "lightweight", "annotated", + N_("head"), N_("lightweight"), N_("annotated"), }; static int commit_name_cmp(const struct commit_name *cn1, @@ -395,10 +395,19 @@ static void describe(const char *arg, int last_one) free_commit_list(list); if (debug) { + static int label_width = -1; + if (label_width < 0) { + int i, w; + for (i = 0; i < ARRAY_SIZE(prio_names); i++) { + w = strlen(_(prio_names[i])); + if (label_width < w) + label_width = w; + } + } for (cur_match = 0; cur_match < match_cnt; cur_match++) { struct possible_tag *t = &all_matches[cur_match]; - fprintf(stderr, " %-11s %8d %s\n", - prio_names[t->name->prio], + fprintf(stderr, " %-*s %8d %s\n", + label_width, _(prio_names[t->name->prio]), t->depth, t->name->path); } fprintf(stderr, _("traversed %lu commits\n"), seen_commits); |