diff options
| author |  Elijah Newren <newren@gmail.com> | 2020-03-27 00:48:56 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-03-27 11:33:30 -0700 |
| commit | 1ac83f42da6437d74098f162fcfa37474c94e223 (patch) | |
| tree | ddd5840938464b3a3b10abb28c619c2132f31d81 | |
| parent | unpack-trees: move ERROR_WOULD_LOSE_SUBMODULE earlier (diff) | |
| download | tgif-1ac83f42da6437d74098f162fcfa37474c94e223.tar.xz | |
unpack-trees: rename ERROR_* fields meant for warnings to WARNING_*
We want to treat issues with setting the SKIP_WORKTREE bit as a warning
rather than an error; rename the enum values to reflect this intent as
a simple step towards that goal.
Reviewed-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | unpack-trees.c | 12 | ||||
| -rw-r--r-- | unpack-trees.h | 8 |
2 files changed, 11 insertions, 9 deletions
diff --git a/unpack-trees.c b/unpack-trees.c index eeac309e30..2a2306c5c2 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -46,10 +46,10 @@ static const char *unpack_plumbing_errors[NB_UNPACK_TREES_ERROR_TYPES] = { /* ERROR_WOULD_LOSE_SUBMODULE */ "Submodule '%s' cannot checkout new HEAD.", - /* ERROR_SPARSE_NOT_UPTODATE_FILE */ + /* WARNING_SPARSE_NOT_UPTODATE_FILE */ "Entry '%s' not uptodate. Cannot update sparse checkout.", - /* ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN */ + /* WARNING_SPARSE_ORPHANED_NOT_OVERWRITTEN */ "Working tree file '%s' would be overwritten by sparse checkout update.", }; @@ -168,9 +168,9 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts, msgs[ERROR_WOULD_LOSE_SUBMODULE] = _("Cannot update submodule:\n%s"); - msgs[ERROR_SPARSE_NOT_UPTODATE_FILE] = + msgs[WARNING_SPARSE_NOT_UPTODATE_FILE] = _("Cannot update sparse checkout: the following entries are not up to date:\n%s"); - msgs[ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN] = + msgs[WARNING_SPARSE_ORPHANED_NOT_OVERWRITTEN] = _("The following working tree files would be overwritten by sparse checkout update:\n%s"); opts->show_all_errors = 1; @@ -509,7 +509,7 @@ static int apply_sparse_checkout(struct index_state *istate, ce->ce_flags &= ~CE_UPDATE; } if (was_skip_worktree && !ce_skip_worktree(ce)) { - if (verify_absent_sparse(ce, ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN, o)) + if (verify_absent_sparse(ce, WARNING_SPARSE_ORPHANED_NOT_OVERWRITTEN, o)) return -1; ce->ce_flags |= CE_UPDATE; } @@ -1875,7 +1875,7 @@ int verify_uptodate(const struct cache_entry *ce, static int verify_uptodate_sparse(const struct cache_entry *ce, struct unpack_trees_options *o) { - return verify_uptodate_1(ce, o, ERROR_SPARSE_NOT_UPTODATE_FILE); + return verify_uptodate_1(ce, o, WARNING_SPARSE_NOT_UPTODATE_FILE); } /* diff --git a/unpack-trees.h b/unpack-trees.h index 3e996a6c0a..aac1ad4b01 100644 --- a/unpack-trees.h +++ b/unpack-trees.h @@ -23,9 +23,11 @@ enum unpack_trees_error_types { ERROR_WOULD_LOSE_UNTRACKED_REMOVED, ERROR_BIND_OVERLAP, ERROR_WOULD_LOSE_SUBMODULE, - ERROR_SPARSE_NOT_UPTODATE_FILE, - ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN, - NB_UNPACK_TREES_ERROR_TYPES + + WARNING_SPARSE_NOT_UPTODATE_FILE, + WARNING_SPARSE_ORPHANED_NOT_OVERWRITTEN, + + NB_UNPACK_TREES_ERROR_TYPES, }; /* |