diff options
| -rw-r--r-- | unpack-trees.c | 4 | ||||
| -rw-r--r-- | unpack-trees.h | 1 |
2 files changed, 0 insertions, 5 deletions
diff --git a/unpack-trees.c b/unpack-trees.c index 0d0eec0221..f72a7a21f9 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -49,8 +49,6 @@ static const char *unpack_plumbing_errors[NB_UNPACK_TREES_ERROR_TYPES] = { /* ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN */ "Working tree file '%s' would be overwritten by sparse checkout update.", - /* ERROR_WOULD_LOSE_ORPHANED_REMOVED */ - "Working tree file '%s' would be removed by sparse checkout update.", /* ERROR_WOULD_LOSE_SUBMODULE */ "Submodule '%s' cannot checkout new HEAD.", @@ -172,8 +170,6 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts, _("Cannot update sparse checkout: the following entries are not up to date:\n%s"); msgs[ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN] = _("The following working tree files would be overwritten by sparse checkout update:\n%s"); - 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] = _("Cannot update submodule:\n%s"); diff --git a/unpack-trees.h b/unpack-trees.h index ae1557fb80..6d7c7b6c2e 100644 --- a/unpack-trees.h +++ b/unpack-trees.h @@ -24,7 +24,6 @@ enum unpack_trees_error_types { ERROR_BIND_OVERLAP, ERROR_SPARSE_NOT_UPTODATE_FILE, ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN, - ERROR_WOULD_LOSE_ORPHANED_REMOVED, ERROR_WOULD_LOSE_SUBMODULE, NB_UNPACK_TREES_ERROR_TYPES }; |