diff options
| author | Jean-Noël Avila <jn.avila@free.fr> | 2022-01-31 23:07:47 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-02-04 22:58:28 +0100 |
| commit | 1a8aea857e4225a9d35a531869fd47777f3063d6 (patch) | |
| tree | 6de239676c35485e95ff12f3ba7629eae3a40197 /builtin/pull.c | |
| parent | i18n: factorize more 'incompatible options' messages (diff) | |
| download | git-1a8aea857e4225a9d35a531869fd47777f3063d6.tar.xz git-1a8aea857e4225a9d35a531869fd47777f3063d6.zip | |
i18n: factorize "invalid value" messages
Use the same message when an invalid value is passed to a command line
option or a configuration variable.
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/pull.c')
| -rw-r--r-- | builtin/pull.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin/pull.c b/builtin/pull.c index 100cbf9fb8..e54a0ccadc 100644 --- a/builtin/pull.c +++ b/builtin/pull.c @@ -42,9 +42,9 @@ static enum rebase_type parse_config_rebase(const char *key, const char *value, return v; if (fatal) - die(_("Invalid value for %s: %s"), key, value); + die(_("invalid value for '%s': '%s'"), key, value); else - error(_("Invalid value for %s: %s"), key, value); + error(_("invalid value for '%s': '%s'"), key, value); return REBASE_INVALID; } @@ -318,7 +318,7 @@ static const char *config_get_ff(void) if (!strcmp(value, "only")) return "--ff-only"; - die(_("Invalid value for pull.ff: %s"), value); + die(_("invalid value for '%s': '%s'"), "pull.ff", value); } /** |