5 #include "argv-array.h"
7 #define MAX_UNPACK_TREES 8
9 struct unpack_trees_options
;
12 typedef int (*merge_fn_t
)(const struct cache_entry
* const *src
,
13 struct unpack_trees_options
*options
);
15 enum unpack_trees_error_types
{
16 ERROR_WOULD_OVERWRITE
= 0,
17 ERROR_NOT_UPTODATE_FILE
,
18 ERROR_NOT_UPTODATE_DIR
,
19 ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN
,
20 ERROR_WOULD_LOSE_UNTRACKED_REMOVED
,
22 ERROR_SPARSE_NOT_UPTODATE_FILE
,
23 ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN
,
24 ERROR_WOULD_LOSE_ORPHANED_REMOVED
,
25 ERROR_WOULD_LOSE_SUBMODULE
,
26 NB_UNPACK_TREES_ERROR_TYPES
30 * Sets the list of user-friendly error messages to be used by the
31 * command "cmd" (either merge or checkout), and show_all_errors to 1.
33 void setup_unpack_trees_porcelain(struct unpack_trees_options
*opts
,
37 * Frees resources allocated by setup_unpack_trees_porcelain().
39 void clear_unpack_trees_porcelain(struct unpack_trees_options
*opts
);
41 struct unpack_trees_options
{
62 struct dir_struct
*dir
;
63 struct pathspec
*pathspec
;
65 const char *msgs
[NB_UNPACK_TREES_ERROR_TYPES
];
66 struct argv_array msgs_to_free
;
68 * Store error messages in an array, each case
69 * corresponding to a error message type
71 struct string_list unpack_rejects
[NB_UNPACK_TREES_ERROR_TYPES
];
76 struct cache_entry
*df_conflict_entry
;
79 struct index_state
*dst_index
;
80 struct index_state
*src_index
;
81 struct index_state result
;
83 struct exclude_list
*el
; /* for internal use */
86 extern int unpack_trees(unsigned n
, struct tree_desc
*t
,
87 struct unpack_trees_options
*options
);
89 int verify_uptodate(const struct cache_entry
*ce
,
90 struct unpack_trees_options
*o
);
92 int threeway_merge(const struct cache_entry
* const *stages
,
93 struct unpack_trees_options
*o
);
94 int twoway_merge(const struct cache_entry
* const *src
,
95 struct unpack_trees_options
*o
);
96 int bind_merge(const struct cache_entry
* const *src
,
97 struct unpack_trees_options
*o
);
98 int oneway_merge(const struct cache_entry
* const *src
,
99 struct unpack_trees_options
*o
);