diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-06-04 03:55:44 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-04 03:55:44 +0300 |
| commit | c5da34c12481ff6edc3f46463cbf43efe856308e (patch) | |
| tree | 1f6be27746458c6314427a3ba264db6341288151 /builtin/notes.c | |
| parent | fe3bf4cb526aa85941c30b6e9104e8b0a84094c3 (diff) | |
| parent | 66f5f6dca95eda46bf02c8d06de8cb265995fd6e (diff) | |
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 'builtin/notes.c')
| -rw-r--r-- | builtin/notes.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/builtin/notes.c b/builtin/notes.c index f2847c41e0..7196bff0eb 100644 --- a/builtin/notes.c +++ b/builtin/notes.c @@ -340,8 +340,10 @@ static struct notes_tree *init_notes_check(const char *subcommand, ref = (flags & NOTES_INIT_WRITABLE) ? t->update_ref : t->ref; if (!starts_with(ref, "refs/notes/")) - /* TRANSLATORS: the first %s will be replaced by a - git notes command: 'add', 'merge', 'remove', etc.*/ + /* + * TRANSLATORS: the first %s will be replaced by a git + * notes command: 'add', 'merge', 'remove', etc. + */ die(_("refusing to %s notes in %s (outside of refs/notes/)"), subcommand, ref); return t; |