diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-04-16 23:29:34 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-04-16 23:29:34 -0700 |
| commit | c8a8951ce56e497775784babb025e0c26a889f7c (patch) | |
| tree | e5b630e43b7803092f59f0ba5cbb995a9a42e923 | |
| parent | 3817d631de9ca75ef60fd18165ffc7ee4f8ab269 (diff) | |
| parent | 6362ed0b29eb281cd44487684da2296a4f431946 (diff) | |
| download | git-c8a8951ce56e497775784babb025e0c26a889f7c.tar.gz | |
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
| -rw-r--r-- | unpack-trees.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 */ |