diff options
| author | Elijah Newren <newren@gmail.com> | 2020-03-27 01:48:56 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-03-27 19:33:30 +0100 |
| commit | 1ac83f42da6437d74098f162fcfa37474c94e223 (patch) | |
| tree | ddd5840938464b3a3b10abb28c619c2132f31d81 /unpack-trees.h | |
| parent | unpack-trees: move ERROR_WOULD_LOSE_SUBMODULE earlier (diff) | |
| download | git-1ac83f42da6437d74098f162fcfa37474c94e223.tar.xz git-1ac83f42da6437d74098f162fcfa37474c94e223.zip | |
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>
Diffstat (limited to 'unpack-trees.h')
| -rw-r--r-- | unpack-trees.h | 8 |
1 files changed, 5 insertions, 3 deletions
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, }; /* |