diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-06-25 11:24:37 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-06-25 11:24:37 -0700 |
| commit | efc478d42e705ad020de008cd852a6b7ade3058f (patch) | |
| tree | ad99b483ae10fb8cd978f19ba89bc30a49b879cd | |
| parent | 9b3dacc95fc6259b116207b4ac345ffb9e86ea3b (diff) | |
| parent | 72a23e6449bc29358760b2ccdfacbd9aa37e9b36 (diff) | |
| download | git-efc478d42e705ad020de008cd852a6b7ade3058f.tar.gz | |
Merge branch 'nd/i18n-misc'
Restructure the way message strings are created, in preparation for
marking them for i18n.
* nd/i18n-misc:
rerere: remove i18n legos in result message
notes-merge: remove i18n legos in merge result message
reflog: remove i18n legos in pruning message
| -rw-r--r-- | builtin/reflog.c | 6 | ||||
| -rw-r--r-- | notes-merge.c | 6 | ||||
| -rw-r--r-- | rerere.c | 12 |
3 files changed, 14 insertions, 10 deletions
diff --git a/builtin/reflog.c b/builtin/reflog.c index 062d7dad1b..b3c9e27bde 100644 --- a/builtin/reflog.c +++ b/builtin/reflog.c @@ -330,8 +330,10 @@ static int expire_reflog_ent(unsigned char *osha1, unsigned char *nsha1, printf("keep %s", message); return 0; prune: - if (!cb->newlog || cb->cmd->verbose) - printf("%sprune %s", cb->newlog ? "" : "would ", message); + if (!cb->newlog) + printf("would prune %s", message); + else if (cb->cmd->verbose) + printf("prune %s", message); return 0; } diff --git a/notes-merge.c b/notes-merge.c index 74aa77ce4b..29c6411fc6 100644 --- a/notes-merge.c +++ b/notes-merge.c @@ -524,8 +524,10 @@ static int merge_from_diffs(struct notes_merge_options *o, free(changes); if (o->verbosity >= 4) - printf("Merge result: %i unmerged notes and a %s notes tree\n", - conflicts, t->dirty ? "dirty" : "clean"); + printf(t->dirty ? + "Merge result: %i unmerged notes and a dirty notes tree\n" : + "Merge result: %i unmerged notes and a clean notes tree\n", + conflicts); return conflicts ? -1 : 1; } @@ -544,13 +544,13 @@ static int do_plain_rerere(struct string_list *rr, int fd) if (has_rerere_resolution(name)) { if (!merge(name, path)) { - if (rerere_autoupdate) + const char *msg; + if (rerere_autoupdate) { string_list_insert(&update, path); - fprintf(stderr, - "%s '%s' using previous resolution.\n", - rerere_autoupdate - ? "Staged" : "Resolved", - path); + msg = "Staged '%s' using previous resolution.\n"; + } else + msg = "Resolved '%s' using previous resolution.\n"; + fprintf(stderr, msg, path); goto mark_resolved; } } |