undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Update an error message.

* sb/unpack-trees-would-lose-submodule-message-update:
  unpack-trees.c: align submodule error message to the other error messages
This commit is contained in:
Junio C Hamano 2017-04-16 23:29:34 -07:00
commit c8a8951ce5
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
unpack-trees.c
View File

@ -167,7 +167,7 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts,
msgs[ERROR_WOULD_LOSE_ORPHANED_REMOVED] = msgs[ERROR_WOULD_LOSE_ORPHANED_REMOVED] =
_("The following working tree files would be removed by sparse checkout update:\n%s"); _("The following working tree files would be removed by sparse checkout update:\n%s");
msgs[ERROR_WOULD_LOSE_SUBMODULE] = msgs[ERROR_WOULD_LOSE_SUBMODULE] =
_("Submodule '%s' cannot checkout new HEAD"); _("Cannot update submodule:\n%s");
opts->show_all_errors = 1; opts->show_all_errors = 1;
/* rejected paths may not have a static buffer */ /* rejected paths may not have a static buffer */