summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0aec44a)
raw | patch | inline | side by side (parent: 0aec44a)
author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | |
Sun, 5 Sep 2010 13:56:57 +0000 (13:56 +0000) | ||
committer | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | |
Sat, 30 Oct 2010 07:58:14 +0000 (07:58 +0000) |
Use sprintf format for the error message that's displayed if
GIT_NOTES_REWRITE_MODE is invalid, and leave a note in a TRANSLATORS
comment indicating what the message means.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
GIT_NOTES_REWRITE_MODE is invalid, and leave a note in a TRANSLATORS
comment indicating what the message means.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
builtin/notes.c | patch | blob | history |
diff --git a/builtin/notes.c b/builtin/notes.c
index 32b8693a46a9385a1a45099de1061546e1a2d534..6aa9f5ae537cbd2bf1206ae37fe7f9574684ce44 100644 (file)
--- a/builtin/notes.c
+++ b/builtin/notes.c
c->mode_from_env = 1;
c->combine = parse_combine_notes_fn(rewrite_mode_env);
if (!c->combine)
- error("Bad " GIT_NOTES_REWRITE_MODE_ENVIRONMENT
- " value: '%s'", rewrite_mode_env);
+ /* TRANSLATORS: The first %s is the name of the
+ environment variable, the second %s is its value */
+ error(_("Bad %s value: '%s'"), GIT_NOTES_REWRITE_MODE_ENVIRONMENT,
+ rewrite_mode_env);
}
if (rewrite_refs_env) {
c->refs_from_env = 1;