git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
* [PATCH] submodule--helper.c: i18n: add a missing space in message
@ 2017-11-25 19:51 Jean-Noel Avila
  0 siblings, 0 replies; 4+ messages in thread
From: Jean-Noel Avila @ 2017-11-25 19:51 UTC (permalink / raw)
  To: git; +Cc: Jean-Noel Avila

The message spans over 2 lines but the C conconcatenation does not add
the needed space between the two lines.
---
 builtin/submodule--helper.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index 2086f0eb0..a5c4a8a69 100644
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -623,7 +623,7 @@ static void status_submodule(const char *path, const struct object_id *ce_oid,
 
 		if (refs_head_ref(get_submodule_ref_store(path),
 				  handle_submodule_head_ref, &oid))
-			die(_("could not resolve HEAD ref inside the"
+			die(_("could not resolve HEAD ref inside the "
 			      "submodule '%s'"), path);
 
 		print_status(flags, '+', path, &oid, displaypath);
-- 
2.15.0


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [PATCH] submodule--helper.c: i18n: add a missing space in message
@ 2017-11-25 19:55 Jean-Noel Avila
  2017-11-25 23:51 ` Eric Sunshine
  2017-11-26  3:52 ` Junio C Hamano
  0 siblings, 2 replies; 4+ messages in thread
From: Jean-Noel Avila @ 2017-11-25 19:55 UTC (permalink / raw)
  To: git; +Cc: Jean-Noel Avila

The message spans over 2 lines but the C conconcatenation does not add
the needed space between the two lines.

Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
---
 builtin/submodule--helper.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index 2086f0eb0..a5c4a8a69 100644
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -623,7 +623,7 @@ static void status_submodule(const char *path, const struct object_id *ce_oid,
 
 		if (refs_head_ref(get_submodule_ref_store(path),
 				  handle_submodule_head_ref, &oid))
-			die(_("could not resolve HEAD ref inside the"
+			die(_("could not resolve HEAD ref inside the "
 			      "submodule '%s'"), path);
 
 		print_status(flags, '+', path, &oid, displaypath);
-- 
2.15.0


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH] submodule--helper.c: i18n: add a missing space in message
  2017-11-25 19:55 Jean-Noel Avila
@ 2017-11-25 23:51 ` Eric Sunshine
  2017-11-26  3:52 ` Junio C Hamano
  1 sibling, 0 replies; 4+ messages in thread
From: Eric Sunshine @ 2017-11-25 23:51 UTC (permalink / raw)
  To: Jean-Noel Avila; +Cc: Git List

On Sat, Nov 25, 2017 at 2:55 PM, Jean-Noel Avila <jn.avila@free.fr> wrote:
> The message spans over 2 lines but the C conconcatenation does not add

s/conconcatenation/concatenation/

> the needed space between the two lines.
>
> Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
> ---
> diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
> index 2086f0eb0..a5c4a8a69 100644
> --- a/builtin/submodule--helper.c
> +++ b/builtin/submodule--helper.c
> @@ -623,7 +623,7 @@ static void status_submodule(const char *path, const struct object_id *ce_oid,
>
>                 if (refs_head_ref(get_submodule_ref_store(path),
>                                   handle_submodule_head_ref, &oid))
> -                       die(_("could not resolve HEAD ref inside the"
> +                       die(_("could not resolve HEAD ref inside the "
>                               "submodule '%s'"), path);
>
>                 print_status(flags, '+', path, &oid, displaypath);
> --
> 2.15.0

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] submodule--helper.c: i18n: add a missing space in message
  2017-11-25 19:55 Jean-Noel Avila
  2017-11-25 23:51 ` Eric Sunshine
@ 2017-11-26  3:52 ` Junio C Hamano
  1 sibling, 0 replies; 4+ messages in thread
From: Junio C Hamano @ 2017-11-26  3:52 UTC (permalink / raw)
  To: Jean-Noel Avila; +Cc: git

Thanks.

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2017-11-26  3:52 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-11-25 19:51 [PATCH] submodule--helper.c: i18n: add a missing space in message Jean-Noel Avila
  -- strict thread matches above, loose matches on Subject: below --
2017-11-25 19:55 Jean-Noel Avila
2017-11-25 23:51 ` Eric Sunshine
2017-11-26  3:52 ` Junio C Hamano

Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).