Imported Upstream version 2.30.0

[platform/upstream/git.git] / unpack-trees.h

diff --git a/unpack-trees.h b/unpack-trees.h
index f2eee0c..2e87875 100644 (file)
--- a/unpack-trees.h
+++ b/unpack-trees.h
@@ -2,11 +2,11 @@
 #define UNPACK_TREES_H
 
 #include "cache.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "string-list.h"
 #include "tree-walk.h"
 
-#define MAX_UNPACK_TREES 8
+#define MAX_UNPACK_TREES MAX_TRAVERSE_TREES
 
 struct cache_entry;
 struct unpack_trees_options;
@@ -22,11 +22,15 @@ enum unpack_trees_error_types {
        ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN,
        ERROR_WOULD_LOSE_UNTRACKED_REMOVED,
        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
+
+       NB_UNPACK_TREES_ERROR_TYPES,
+
+       WARNING_SPARSE_NOT_UPTODATE_FILE,
+       WARNING_SPARSE_UNMERGED_FILE,
+       WARNING_SPARSE_ORPHANED_NOT_OVERWRITTEN,
+
+       NB_UNPACK_TREES_WARNING_TYPES,
 };
 
 /*
@@ -65,13 +69,13 @@ struct unpack_trees_options {
        struct dir_struct *dir;
        struct pathspec *pathspec;
        merge_fn_t fn;
-       const char *msgs[NB_UNPACK_TREES_ERROR_TYPES];
-       struct argv_array msgs_to_free;
+       const char *msgs[NB_UNPACK_TREES_WARNING_TYPES];
+       struct strvec msgs_to_free;
        /*
         * Store error messages in an array, each case
         * corresponding to a error message type
         */
-       struct string_list unpack_rejects[NB_UNPACK_TREES_ERROR_TYPES];
+       struct string_list unpack_rejects[NB_UNPACK_TREES_WARNING_TYPES];
 
        int head_idx;
        int merge_size;
@@ -84,11 +88,21 @@ struct unpack_trees_options {
        struct index_state result;
 
        struct pattern_list *pl; /* for internal use */
+       struct checkout_metadata meta;
 };
 
 int unpack_trees(unsigned n, struct tree_desc *t,
                 struct unpack_trees_options *options);
 
+enum update_sparsity_result {
+       UPDATE_SPARSITY_SUCCESS = 0,
+       UPDATE_SPARSITY_WARNINGS = 1,
+       UPDATE_SPARSITY_INDEX_UPDATE_FAILURES = -1,
+       UPDATE_SPARSITY_WORKTREE_UPDATE_FAILURES = -2
+};
+
+enum update_sparsity_result update_sparsity(struct unpack_trees_options *options);
+
 int verify_uptodate(const struct cache_entry *ce,
                    struct unpack_trees_options *o);