4 #include "string-list.h"
6 #define MAX_UNPACK_TREES 8
8 struct unpack_trees_options
;
11 typedef int (*merge_fn_t
)(struct cache_entry
**src
,
12 struct unpack_trees_options
*options
);
14 enum unpack_trees_error_types
{
15 ERROR_WOULD_OVERWRITE
= 0,
16 ERROR_NOT_UPTODATE_FILE
,
17 ERROR_NOT_UPTODATE_DIR
,
18 ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN
,
19 ERROR_WOULD_LOSE_UNTRACKED_REMOVED
,
21 ERROR_SPARSE_NOT_UPTODATE_FILE
,
22 ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN
,
23 ERROR_WOULD_LOSE_ORPHANED_REMOVED
,
24 NB_UNPACK_TREES_ERROR_TYPES
28 * Sets the list of user-friendly error messages to be used by the
29 * command "cmd" (either merge or checkout), and show_all_errors to 1.
31 void setup_unpack_trees_porcelain(struct unpack_trees_options
*opts
,
34 struct unpack_trees_options
{
52 struct dir_struct
*dir
;
54 const char *msgs
[NB_UNPACK_TREES_ERROR_TYPES
];
56 * Store error messages in an array, each case
57 * corresponding to a error message type
59 struct string_list unpack_rejects
[NB_UNPACK_TREES_ERROR_TYPES
];
64 struct cache_entry
*df_conflict_entry
;
67 struct index_state
*dst_index
;
68 struct index_state
*src_index
;
69 struct index_state result
;
71 struct exclude_list
*el
; /* for internal use */
74 extern int unpack_trees(unsigned n
, struct tree_desc
*t
,
75 struct unpack_trees_options
*options
);
77 int threeway_merge(struct cache_entry
**stages
, struct unpack_trees_options
*o
);
78 int twoway_merge(struct cache_entry
**src
, struct unpack_trees_options
*o
);
79 int bind_merge(struct cache_entry
**src
, struct unpack_trees_options
*o
);
80 int oneway_merge(struct cache_entry
**src
, struct unpack_trees_options
*o
);