From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 17 Apr 2017 06:29:34 +0000 (-0700)
Subject: Merge branch 'sb/unpack-trees-would-lose-submodule-message-update'
X-Git-Tag: v2.13.0-rc0~20
X-Git-Url: https://www.git.lorimer.id.au/gitweb.git/diff_plain/c8a8951ce56e497775784babb025e0c26a889f7c?hp=3817d631de9ca75ef60fd18165ffc7ee4f8ab269

Merge branch 'sb/unpack-trees-would-lose-submodule-message-update'

Update an error message.

* sb/unpack-trees-would-lose-submodule-message-update:
unpack-trees.c: align submodule error message to the other error messages
---

diff --git a/unpack-trees.c b/unpack-trees.c
index 8333da2cc9..6b7356dab2 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 */