]> git.ipfire.org Git - thirdparty/git.git/blame - unpack-trees.h
unpack-trees: refuse to remove startup_info->original_cwd
[thirdparty/git.git] / unpack-trees.h
CommitLineData
16da134b
JS
1#ifndef UNPACK_TREES_H
2#define UNPACK_TREES_H
3
ef3ca954 4#include "cache.h"
dbbcd44f 5#include "strvec.h"
ef3ca954
EN
6#include "string-list.h"
7#include "tree-walk.h"
7980872d 8
5290d451 9#define MAX_UNPACK_TREES MAX_TRAVERSE_TREES
ca885a4f 10
ef3ca954 11struct cache_entry;
16da134b 12struct unpack_trees_options;
caa3d554 13struct pattern_list;
16da134b 14
5828e835 15typedef int (*merge_fn_t)(const struct cache_entry * const *src,
34110cd4 16 struct unpack_trees_options *options);
16da134b 17
08353ebb
MM
18enum unpack_trees_error_types {
19 ERROR_WOULD_OVERWRITE = 0,
20 ERROR_NOT_UPTODATE_FILE,
21 ERROR_NOT_UPTODATE_DIR,
b817e545 22 ERROR_CWD_IN_THE_WAY,
08402b04
MM
23 ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN,
24 ERROR_WOULD_LOSE_UNTRACKED_REMOVED,
08353ebb 25 ERROR_BIND_OVERLAP,
a7bc845a 26 ERROR_WOULD_LOSE_SUBMODULE,
1ac83f42 27
6271d77c
EN
28 NB_UNPACK_TREES_ERROR_TYPES,
29
1ac83f42 30 WARNING_SPARSE_NOT_UPTODATE_FILE,
ebb568b9 31 WARNING_SPARSE_UNMERGED_FILE,
1ac83f42
EN
32 WARNING_SPARSE_ORPHANED_NOT_OVERWRITTEN,
33
6271d77c 34 NB_UNPACK_TREES_WARNING_TYPES,
8ccba008
JH
35};
36
dc1166e6
MM
37/*
38 * Sets the list of user-friendly error messages to be used by the
5e65ee35 39 * command "cmd" (either merge or checkout), and show_all_errors to 1.
dc1166e6 40 */
e294030f
MM
41void setup_unpack_trees_porcelain(struct unpack_trees_options *opts,
42 const char *cmd);
dc1166e6 43
1c41d280
44/*
45 * Frees resources allocated by setup_unpack_trees_porcelain().
46 */
47void clear_unpack_trees_porcelain(struct unpack_trees_options *opts);
48
480d3d6b
EN
49enum unpack_trees_reset_type {
50 UNPACK_RESET_NONE = 0, /* traditional "false" value; still valid */
51 UNPACK_RESET_INVALID = 1, /* "true" no longer valid; use below values */
52 UNPACK_RESET_PROTECT_UNTRACKED,
53 UNPACK_RESET_OVERWRITE_UNTRACKED
54};
55
16da134b 56struct unpack_trees_options {
480d3d6b 57 unsigned int merge,
5a56da58 58 update,
04988c8d 59 preserve_ignored,
b878579a 60 clone,
5a56da58
SB
61 index_only,
62 nontrivial_merge,
63 trivial_merges_only,
64 verbose_update,
65 aggressive,
66 skip_unmerged,
67 initial_checkout,
68 diff_index_cached,
ba655da5 69 debug_unpack,
08aefc9e 70 skip_sparse_checkout,
b165fac8 71 quiet,
b4194828 72 exiting_early,
2c9078d0 73 show_all_errors,
fa0bde45 74 dry_run;
480d3d6b 75 enum unpack_trees_reset_type reset;
16da134b 76 const char *prefix;
da165f47 77 int cache_bottom;
40e37256 78 struct pathspec *pathspec;
16da134b 79 merge_fn_t fn;
6271d77c 80 const char *msgs[NB_UNPACK_TREES_WARNING_TYPES];
c972bf4c 81 struct strvec msgs_to_free;
e6c111b4
MM
82 /*
83 * Store error messages in an array, each case
84 * corresponding to a error message type
85 */
6271d77c 86 struct string_list unpack_rejects[NB_UNPACK_TREES_WARNING_TYPES];
16da134b
JS
87
88 int head_idx;
89 int merge_size;
90
91 struct cache_entry *df_conflict_entry;
d1f2d7e8 92 void *unpack_data;
34110cd4
LT
93
94 struct index_state *dst_index;
32260ad5 95 struct index_state *src_index;
34110cd4 96 struct index_state result;
08aefc9e 97
caa3d554 98 struct pattern_list *pl; /* for internal use */
c42e0b64 99 struct dir_struct *dir; /* for internal use only */
13e7ed6a 100 struct checkout_metadata meta;
16da134b
JS
101};
102
340f4bc9
NTND
103int unpack_trees(unsigned n, struct tree_desc *t,
104 struct unpack_trees_options *options);
16da134b 105
7af7a258
EN
106enum update_sparsity_result {
107 UPDATE_SPARSITY_SUCCESS = 0,
108 UPDATE_SPARSITY_WARNINGS = 1,
109 UPDATE_SPARSITY_INDEX_UPDATE_FAILURES = -1,
110 UPDATE_SPARSITY_WORKTREE_UPDATE_FAILURES = -2
111};
112
113enum update_sparsity_result update_sparsity(struct unpack_trees_options *options);
114
64b1abe9
EN
115int verify_uptodate(const struct cache_entry *ce,
116 struct unpack_trees_options *o);
117
5828e835
RS
118int threeway_merge(const struct cache_entry * const *stages,
119 struct unpack_trees_options *o);
120int twoway_merge(const struct cache_entry * const *src,
121 struct unpack_trees_options *o);
122int bind_merge(const struct cache_entry * const *src,
123 struct unpack_trees_options *o);
124int oneway_merge(const struct cache_entry * const *src,
125 struct unpack_trees_options *o);
d3c7bf73
DL
126int stash_worktree_untracked_merge(const struct cache_entry * const *src,
127 struct unpack_trees_options *o);
076b0adc 128
16da134b 129#endif