summaryrefslogtreecommitdiff
path: root/ref-filter.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 /ref-filter.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 'ref-filter.c')
-rw-r--r--ref-filter.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/ref-filter.c b/ref-filter.c
index 3742abb..af5c0ed 100644
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -1258,13 +1258,17 @@ char *get_head_description(void)
state.branch);
else if (state.detached_from) {
if (state.detached_at)
- /* TRANSLATORS: make sure this matches
- "HEAD detached at " in wt-status.c */
+ /*
+ * TRANSLATORS: make sure this matches "HEAD
+ * detached at " in wt-status.c
+ */
strbuf_addf(&desc, _("(HEAD detached at %s)"),
state.detached_from);
else
- /* TRANSLATORS: make sure this matches
- "HEAD detached from " in wt-status.c */
+ /*
+ * TRANSLATORS: make sure this matches "HEAD
+ * detached from " in wt-status.c
+ */
strbuf_addf(&desc, _("(HEAD detached from %s)"),
state.detached_from);
}