Browse Source

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
maint
Junio C Hamano 8 years ago
parent
commit
c8a8951ce5
  1. 2
      unpack-trees.c

2
unpack-trees.c

@ -167,7 +167,7 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts, @@ -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 */

Loading…
Cancel
Save