mirror of
https://github.com/git-for-windows/git.git
synced 2026-04-09 15:01:59 -05:00
pretty.c: better die message %(count) and %(total)
Improve die messages for commands that do not support %(count) and %(total) Signed-off-by: Mirko Faina <mroik@delayed.space> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
committed by
Junio C Hamano
parent
b3c222ed91
commit
60cb27ed65
4
pretty.c
4
pretty.c
@@ -1551,7 +1551,7 @@ static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */
|
||||
|
||||
if (starts_with(placeholder, "(count)")) {
|
||||
if (!c->pretty_ctx->rev)
|
||||
die(_("this format specifier can't be used with this command"));
|
||||
die(_("%s is not supported by this command"), "%(count)");
|
||||
strbuf_addf(sb, "%0*d", decimal_width(c->pretty_ctx->rev->total),
|
||||
c->pretty_ctx->rev->nr);
|
||||
return 7;
|
||||
@@ -1559,7 +1559,7 @@ static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */
|
||||
|
||||
if (starts_with(placeholder, "(total)")) {
|
||||
if (!c->pretty_ctx->rev)
|
||||
die(_("this format specifier can't be used with this command"));
|
||||
die(_("%s is not supported by this command"), "%(total)");
|
||||
strbuf_addf(sb, "%d", c->pretty_ctx->rev->total);
|
||||
return 7;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user