summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Beller <sbeller@google.com>2017-03-29 22:34:24 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-03-29 22:47:36 (GMT)
commit6362ed0b29eb281cd44487684da2296a4f431946 (patch)
tree3429f6be23b590db4c232d40e4a7289efc0a7c36
parente1104a5ee539408b81566066aaa6963cb87d5cd6 (diff)
downloadgit-6362ed0b29eb281cd44487684da2296a4f431946.zip
git-6362ed0b29eb281cd44487684da2296a4f431946.tar.gz
git-6362ed0b29eb281cd44487684da2296a4f431946.tar.bz2
unpack-trees.c: align submodule error message to the other error messages
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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--unpack-trees.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/unpack-trees.c b/unpack-trees.c
index 8333da2..6b7356d 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");
+ _("Cannot update submodule:\n%s");
opts->show_all_errors = 1;
/* rejected paths may not have a static buffer */