Skip to content

Commit c8a8951

Browse files
committed
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
2 parents 3817d63 + 6362ed0 commit c8a8951

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

unpack-trees.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts,
167167
msgs[ERROR_WOULD_LOSE_ORPHANED_REMOVED] =
168168
_("The following working tree files would be removed by sparse checkout update:\n%s");
169169
msgs[ERROR_WOULD_LOSE_SUBMODULE] =
170-
_("Submodule '%s' cannot checkout new HEAD");
170+
_("Cannot update submodule:\n%s");
171171

172172
opts->show_all_errors = 1;
173173
/* rejected paths may not have a static buffer */

0 commit comments

Comments
 (0)