diff options
| author | Elijah Newren <newren@gmail.com> | 2020-03-27 01:48:55 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-03-27 19:33:30 +0100 |
| commit | cd002c15611a995a29b9e5881745bba402d63952 (patch) | |
| tree | 84ee5fa8e6d521a8d9d81d0d96f6bbba711d0238 /unpack-trees.h | |
| parent | sparse-checkout: use improved unpack_trees porcelain messages (diff) | |
| download | git-cd002c15611a995a29b9e5881745bba402d63952.tar.xz git-cd002c15611a995a29b9e5881745bba402d63952.zip | |
unpack-trees: move ERROR_WOULD_LOSE_SUBMODULE earlier
A minor change, but we want to convert the sparse messages to warnings
and this allows us to group warnings and errors.
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 '')
| -rw-r--r-- | unpack-trees.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/unpack-trees.h b/unpack-trees.h index 5cf41ef5b5..3e996a6c0a 100644 --- a/unpack-trees.h +++ b/unpack-trees.h @@ -22,9 +22,9 @@ enum unpack_trees_error_types { ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN, ERROR_WOULD_LOSE_UNTRACKED_REMOVED, ERROR_BIND_OVERLAP, + ERROR_WOULD_LOSE_SUBMODULE, ERROR_SPARSE_NOT_UPTODATE_FILE, ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN, - ERROR_WOULD_LOSE_SUBMODULE, NB_UNPACK_TREES_ERROR_TYPES }; |