diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-06-05 09:03:10 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-05 09:03:10 +0900 |
| commit | b19174e2f37cc696cbfded9a02c2f2fd6e93bce7 (patch) | |
| tree | a006fc1e437b51f50e904ffca1e10add88b0ede8 /notes-utils.c | |
| parent | 916a33875499a230012348ecbb8efcc305142579 (diff) | |
| parent | 66f5f6dca95eda46bf02c8d06de8cb265995fd6e (diff) | |
Merge branch 'ab/c-translators-comment-style' into maint
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.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/notes-utils.c b/notes-utils.c index 24a33616a4..8f9ad7d1f8 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); } |