From: Stefan Beller <sbeller@google.com>
To: gitster@pobox.com
Cc: git@vger.kernel.org, Stefan Beller <sbeller@google.com>
Subject: [PATCH 2/2] unpack-trees.c: align submodule error message to the other error messages
Date: Wed, 29 Mar 2017 11:37:43 -0700 [thread overview]
Message-ID: <20170329183743.27506-2-sbeller@google.com> (raw)
In-Reply-To: <20170329183743.27506-1-sbeller@google.com>
As the place holder in the error message is for multiple submodules,
we don't want to encapsulate the string place holder in single quotes.
Signed-off-by: Stefan Beller <sbeller@google.com>
---
unpack-trees.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/unpack-trees.c b/unpack-trees.c
index 8333da2cc9..9f386cc174 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -167,7 +167,7 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts,
msgs[ERROR_WOULD_LOSE_ORPHANED_REMOVED] =
_("The following working tree files would be removed by sparse checkout update:\n%s");
msgs[ERROR_WOULD_LOSE_SUBMODULE] =
- _("Submodule '%s' cannot checkout new HEAD");
+ _("The following submodules cannot checkout a new HEAD:\n%s");
opts->show_all_errors = 1;
/* rejected paths may not have a static buffer */
--
2.12.0.rc1.52.g2de7d24de9.dirty
next prev parent reply other threads:[~2017-03-29 18:38 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-29 18:37 [PATCH 1/2] entry.c: submodule recursing: respect force flag correctly Stefan Beller
2017-03-29 18:37 ` Stefan Beller [this message]
2017-03-29 18:48 ` [PATCH 2/2] unpack-trees.c: align submodule error message to the other error messages Jonathan Nieder
2017-03-29 21:33 ` Junio C Hamano
2017-03-29 22:34 ` [PATCH] " Stefan Beller
2017-03-29 22:47 ` Junio C Hamano
2017-03-29 18:45 ` [PATCH 1/2] entry.c: submodule recursing: respect force flag correctly Jonathan Nieder
2017-03-29 21:30 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170329183743.27506-2-sbeller@google.com \
--to=sbeller@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.