From 18986d5377f19e069afffa6689d507b22f1d6c71 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= Date: Mon, 23 Apr 2012 19:30:25 +0700 Subject: [PATCH] i18n: make warn_dangling_symref() automatically append \n MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This helps remove \n from translatable strings Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano --- builtin/fetch.c | 4 ++-- builtin/remote.c | 4 ++-- refs.c | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/builtin/fetch.c b/builtin/fetch.c index 65f5f9b72f..a8c3e4ceb8 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -537,8 +537,8 @@ static int prune_refs(struct refspec *refs, int ref_count, struct ref *ref_map) int result = 0; struct ref *ref, *stale_refs = get_stale_heads(refs, ref_count, ref_map); const char *dangling_msg = dry_run - ? _(" (%s will become dangling)\n") - : _(" (%s has become dangling)\n"); + ? _(" (%s will become dangling)") + : _(" (%s has become dangling)"); for (ref = stale_refs; ref; ref = ref->next) { if (!dry_run) diff --git a/builtin/remote.c b/builtin/remote.c index fec92bc66e..1b034731b4 100644 --- a/builtin/remote.c +++ b/builtin/remote.c @@ -1260,8 +1260,8 @@ static int prune_remote(const char *remote, int dry_run) int result = 0, i; struct ref_states states; const char *dangling_msg = dry_run - ? " %s will become dangling!\n" - : " %s has become dangling!\n"; + ? " %s will become dangling!" + : " %s has become dangling!"; memset(&states, 0, sizeof(states)); get_remote_ref_states(remote, &states, GET_REF_STATES); diff --git a/refs.c b/refs.c index c9f6835351..052c2f6058 100644 --- a/refs.c +++ b/refs.c @@ -395,6 +395,7 @@ static int warn_if_dangling_symref(const char *refname, const unsigned char *sha return 0; fprintf(d->fp, d->msg_fmt, refname); + fputc('\n', d->fp); return 0; } -- 2.11.4.GIT