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 <redacted>
Signed-off-by: Elijah Newren <redacted>
Signed-off-by: Junio C Hamano <redacted>

diff --git a/unpack-trees.c b/unpack-trees.c
index eeac309e30e570b6a6d2676e56a0ac160a9bb6ec..2a2306c5c28dc3b2ccb999359f10943c8d4cb17a 100644 (file)
--- 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 3e996a6c0a9fbfced7bf2eb53638c7df3cd4800f..aac1ad4b014bce2ed9ede8ed3700fc8a54d955de 100644 (file)
--- 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,
 };
 
 /*