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 /builtin | |
| parent | Merge branch 'nd/i18n-branch-lego' (diff) | |
| parent | rerere: remove i18n legos in result message (diff) | |
| download | tgif-efc478d42e705ad020de008cd852a6b7ade3058f.tar.xz | |
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
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/reflog.c | 6 |
1 files changed, 4 insertions, 2 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; } |