summaryrefslogtreecommitdiff
path: root/notes-utils.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-06-04 00:55:44 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-06-04 00:55:44 (GMT)
commitc5da34c12481ff6edc3f46463cbf43efe856308e (patch)
tree1f6be27746458c6314427a3ba264db6341288151 /notes-utils.c
parentfe3bf4cb526aa85941c30b6e9104e8b0a84094c3 (diff)
parent66f5f6dca95eda46bf02c8d06de8cb265995fd6e (diff)
downloadgit-c5da34c12481ff6edc3f46463cbf43efe856308e.zip
git-c5da34c12481ff6edc3f46463cbf43efe856308e.tar.gz
git-c5da34c12481ff6edc3f46463cbf43efe856308e.tar.bz2
Merge branch 'ab/c-translators-comment-style'
Update the C style recommendation for notes for translators, as recent versions of gettext tools can work with our style of multi-line comments. * ab/c-translators-comment-style: C style: use standard style for "TRANSLATORS" comments
Diffstat (limited to 'notes-utils.c')
-rw-r--r--notes-utils.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/notes-utils.c b/notes-utils.c
index 325ff3d..031503d 100644
--- a/notes-utils.c
+++ b/notes-utils.c
@@ -132,8 +132,11 @@ struct notes_rewrite_cfg *init_copy_notes_for_rewrite(const char *cmd)
c->mode_from_env = 1;
c->combine = parse_combine_notes_fn(rewrite_mode_env);
if (!c->combine)
- /* TRANSLATORS: The first %s is the name of the
- environment variable, the second %s is its value */
+ /*
+ * 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);
}