]>
Commit | Line | Data |
---|---|---|
8bc9a0c7 LT |
1 | /* |
2 | * GIT - The information manager from hell | |
3 | * | |
4 | * Copyright (C) Linus Torvalds, 2005 | |
5 | */ | |
4d3fe0c5 | 6 | |
e83c5163 | 7 | #include "cache.h" |
b2141fc1 | 8 | #include "config.h" |
697cc8ef | 9 | #include "lockfile.h" |
ee6566e8 DB |
10 | #include "object.h" |
11 | #include "tree.h" | |
1ccf5a34 | 12 | #include "tree-walk.h" |
bad68ec9 | 13 | #include "cache-tree.h" |
16da134b | 14 | #include "unpack-trees.h" |
f8a9d428 | 15 | #include "dir.h" |
d147e501 | 16 | #include "builtin.h" |
5a56da58 | 17 | #include "parse-options.h" |
cfc5789a | 18 | #include "resolve-undo.h" |
25804914 SB |
19 | #include "submodule.h" |
20 | #include "submodule-config.h" | |
ee6566e8 | 21 | |
933bf40a | 22 | static int nr_trees; |
fb1bb965 | 23 | static int read_empty; |
ca885a4f | 24 | static struct tree *trees[MAX_UNPACK_TREES]; |
ee6566e8 | 25 | |
4939e2c4 | 26 | static int list_tree(struct object_id *oid) |
ee6566e8 | 27 | { |
933bf40a LT |
28 | struct tree *tree; |
29 | ||
ca885a4f JH |
30 | if (nr_trees >= MAX_UNPACK_TREES) |
31 | die("I cannot read more than %d trees", MAX_UNPACK_TREES); | |
a9dbc179 | 32 | tree = parse_tree_indirect(oid); |
ee6566e8 DB |
33 | if (!tree) |
34 | return -1; | |
933bf40a | 35 | trees[nr_trees++] = tree; |
ee6566e8 DB |
36 | return 0; |
37 | } | |
38 | ||
5a56da58 | 39 | static const char * const read_tree_usage[] = { |
9476c2c3 | 40 | N_("git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) [-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"), |
5a56da58 SB |
41 | NULL |
42 | }; | |
43 | ||
44 | static int index_output_cb(const struct option *opt, const char *arg, | |
45 | int unset) | |
46 | { | |
47 | set_alternate_index_output(arg); | |
48 | return 0; | |
49 | } | |
50 | ||
51 | static int exclude_per_directory_cb(const struct option *opt, const char *arg, | |
52 | int unset) | |
53 | { | |
54 | struct dir_struct *dir; | |
55 | struct unpack_trees_options *opts; | |
56 | ||
57 | opts = (struct unpack_trees_options *)opt->value; | |
58 | ||
59 | if (opts->dir) | |
60 | die("more than one --exclude-per-directory given."); | |
61 | ||
62 | dir = xcalloc(1, sizeof(*opts->dir)); | |
63 | dir->flags |= DIR_SHOW_IGNORED; | |
64 | dir->exclude_per_dir = arg; | |
65 | opts->dir = dir; | |
66 | /* We do not need to nor want to do read-directory | |
67 | * here; we are merely interested in reusing the | |
68 | * per directory ignore stack mechanism. | |
69 | */ | |
70 | return 0; | |
71 | } | |
c5bac17a | 72 | |
eb9ae4b5 | 73 | static void debug_stage(const char *label, const struct cache_entry *ce, |
ba655da5 JH |
74 | struct unpack_trees_options *o) |
75 | { | |
76 | printf("%s ", label); | |
77 | if (!ce) | |
78 | printf("(missing)\n"); | |
79 | else if (ce == o->df_conflict_entry) | |
80 | printf("(conflict)\n"); | |
81 | else | |
82 | printf("%06o #%d %s %.8s\n", | |
83 | ce->ce_mode, ce_stage(ce), ce->name, | |
99d1a986 | 84 | oid_to_hex(&ce->oid)); |
ba655da5 JH |
85 | } |
86 | ||
5828e835 RS |
87 | static int debug_merge(const struct cache_entry * const *stages, |
88 | struct unpack_trees_options *o) | |
ba655da5 JH |
89 | { |
90 | int i; | |
91 | ||
92 | printf("* %d-way merge\n", o->merge_size); | |
93 | debug_stage("index", stages[0], o); | |
94 | for (i = 1; i <= o->merge_size; i++) { | |
95 | char buf[24]; | |
5096d490 | 96 | xsnprintf(buf, sizeof(buf), "ent#%d", i); |
ba655da5 JH |
97 | debug_stage(buf, stages[i], o); |
98 | } | |
99 | return 0; | |
100 | } | |
101 | ||
046b4823 | 102 | static int git_read_tree_config(const char *var, const char *value, void *cb) |
25804914 | 103 | { |
046b4823 SB |
104 | if (!strcmp(var, "submodule.recurse")) |
105 | return git_default_submodule_config(var, value, cb); | |
25804914 | 106 | |
046b4823 | 107 | return git_default_config(var, value, cb); |
25804914 SB |
108 | } |
109 | ||
a91af794 | 110 | int cmd_read_tree(int argc, const char **argv, const char *unused_prefix) |
e83c5163 | 111 | { |
03b86647 | 112 | int i, stage = 0; |
4939e2c4 | 113 | struct object_id oid; |
ca885a4f | 114 | struct tree_desc t[MAX_UNPACK_TREES]; |
16da134b | 115 | struct unpack_trees_options opts; |
5a56da58 | 116 | int prefix_set = 0; |
0fa5a2ed | 117 | struct lock_file lock_file = LOCK_INIT; |
5a56da58 | 118 | const struct option read_tree_options[] = { |
230c6cdb NTND |
119 | { OPTION_CALLBACK, 0, "index-output", NULL, N_("file"), |
120 | N_("write resulting index to <file>"), | |
5a56da58 | 121 | PARSE_OPT_NONEG, index_output_cb }, |
84a7f096 SB |
122 | OPT_BOOL(0, "empty", &read_empty, |
123 | N_("only empty the index")), | |
230c6cdb NTND |
124 | OPT__VERBOSE(&opts.verbose_update, N_("be verbose")), |
125 | OPT_GROUP(N_("Merging")), | |
84a7f096 SB |
126 | OPT_BOOL('m', NULL, &opts.merge, |
127 | N_("perform a merge in addition to a read")), | |
128 | OPT_BOOL(0, "trivial", &opts.trivial_merges_only, | |
129 | N_("3-way merge if no file level merging required")), | |
130 | OPT_BOOL(0, "aggressive", &opts.aggressive, | |
131 | N_("3-way merge in presence of adds and removes")), | |
132 | OPT_BOOL(0, "reset", &opts.reset, | |
133 | N_("same as -m, but discard unmerged entries")), | |
230c6cdb NTND |
134 | { OPTION_STRING, 0, "prefix", &opts.prefix, N_("<subdirectory>/"), |
135 | N_("read the tree into the index under <subdirectory>/"), | |
5a56da58 | 136 | PARSE_OPT_NONEG | PARSE_OPT_LITERAL_ARGHELP }, |
84a7f096 SB |
137 | OPT_BOOL('u', NULL, &opts.update, |
138 | N_("update working tree with merge result")), | |
5a56da58 | 139 | { OPTION_CALLBACK, 0, "exclude-per-directory", &opts, |
230c6cdb NTND |
140 | N_("gitignore"), |
141 | N_("allow explicitly ignored files to be overwritten"), | |
5a56da58 | 142 | PARSE_OPT_NONEG, exclude_per_directory_cb }, |
84a7f096 SB |
143 | OPT_BOOL('i', NULL, &opts.index_only, |
144 | N_("don't check the working tree after merging")), | |
230c6cdb | 145 | OPT__DRY_RUN(&opts.dry_run, N_("don't update the index or the work tree")), |
84a7f096 SB |
146 | OPT_BOOL(0, "no-sparse-checkout", &opts.skip_sparse_checkout, |
147 | N_("skip applying sparse checkout filter")), | |
148 | OPT_BOOL(0, "debug-unpack", &opts.debug_unpack, | |
149 | N_("debug unpack-trees")), | |
58b75bd6 | 150 | { OPTION_CALLBACK, 0, "recurse-submodules", NULL, |
25804914 | 151 | "checkout", "control recursive updating of submodules", |
d7a3803f | 152 | PARSE_OPT_OPTARG, option_parse_recurse_submodules_worktree_updater }, |
5a56da58 SB |
153 | OPT_END() |
154 | }; | |
bb233d69 | 155 | |
16da134b JS |
156 | memset(&opts, 0, sizeof(opts)); |
157 | opts.head_idx = -1; | |
34110cd4 LT |
158 | opts.src_index = &the_index; |
159 | opts.dst_index = &the_index; | |
344c52ae | 160 | |
046b4823 | 161 | git_config(git_read_tree_config, NULL); |
53228a5f | 162 | |
5a56da58 SB |
163 | argc = parse_options(argc, argv, unused_prefix, read_tree_options, |
164 | read_tree_usage, 0); | |
83adac3c | 165 | |
d7a3803f | 166 | hold_locked_index(&lock_file, LOCK_DIE_ON_ERROR); |
25804914 | 167 | |
5a56da58 SB |
168 | prefix_set = opts.prefix ? 1 : 0; |
169 | if (1 < opts.merge + opts.reset + prefix_set) | |
170 | die("Which one? -m, --reset, or --prefix?"); | |
db137fe9 | 171 | |
5a092ceb NTND |
172 | /* |
173 | * NEEDSWORK | |
174 | * | |
175 | * The old index should be read anyway even if we're going to | |
176 | * destroy all index entries because we still need to preserve | |
177 | * certain information such as index version or split-index | |
178 | * mode. | |
179 | */ | |
180 | ||
db137fe9 AJ |
181 | if (opts.reset || opts.merge || opts.prefix) { |
182 | if (read_cache_unmerged() && (opts.prefix || opts.merge)) | |
183 | die("You need to resolve your current index first"); | |
184 | stage = opts.merge = 1; | |
185 | } | |
cfc5789a | 186 | resolve_undo_clear(); |
5a56da58 SB |
187 | |
188 | for (i = 0; i < argc; i++) { | |
189 | const char *arg = argv[i]; | |
720d150c | 190 | |
4939e2c4 | 191 | if (get_oid(arg, &oid)) |
31fff305 | 192 | die("Not a valid object name %s", arg); |
4939e2c4 | 193 | if (list_tree(&oid) < 0) |
2de381f9 | 194 | die("failed to unpack tree object %s", arg); |
d99082e0 | 195 | stage++; |
83adac3c | 196 | } |
b9b10d36 | 197 | if (!nr_trees && !read_empty && !opts.merge) |
fb1bb965 JK |
198 | warning("read-tree: emptying the index with no arguments is deprecated; use --empty"); |
199 | else if (nr_trees > 0 && read_empty) | |
200 | die("passing trees as arguments contradicts --empty"); | |
201 | ||
5a56da58 SB |
202 | if (1 < opts.index_only + opts.update) |
203 | die("-u and -i at the same time makes no sense"); | |
c01499ef | 204 | if ((opts.update || opts.index_only) && !opts.merge) |
a429d2dd SB |
205 | die("%s is meaningless without -m, --reset, or --prefix", |
206 | opts.update ? "-u" : "-i"); | |
f8a9d428 JH |
207 | if ((opts.dir && !opts.update)) |
208 | die("--exclude-per-directory is meaningless unless -u"); | |
b6469a81 NTND |
209 | if (opts.merge && !opts.index_only) |
210 | setup_work_tree(); | |
7dd43575 | 211 | |
16da134b | 212 | if (opts.merge) { |
ee6566e8 | 213 | switch (stage - 1) { |
9932242f JNA |
214 | case 0: |
215 | die("you must specify at least one tree to merge"); | |
216 | break; | |
ee6566e8 | 217 | case 1: |
16da134b | 218 | opts.fn = opts.prefix ? bind_merge : oneway_merge; |
ee6566e8 DB |
219 | break; |
220 | case 2: | |
16da134b | 221 | opts.fn = twoway_merge; |
fa7b3c2f | 222 | opts.initial_checkout = is_cache_unborn(); |
ee6566e8 DB |
223 | break; |
224 | case 3: | |
ee6566e8 | 225 | default: |
16da134b | 226 | opts.fn = threeway_merge; |
ee6566e8 | 227 | break; |
03efa6d9 | 228 | } |
ee6566e8 | 229 | |
ee6566e8 | 230 | if (stage - 1 >= 3) |
16da134b | 231 | opts.head_idx = stage - 2; |
ee6566e8 | 232 | else |
16da134b | 233 | opts.head_idx = 1; |
ee6566e8 DB |
234 | } |
235 | ||
ba655da5 JH |
236 | if (opts.debug_unpack) |
237 | opts.fn = debug_merge; | |
238 | ||
8cc21ce7 | 239 | cache_tree_free(&active_cache_tree); |
933bf40a LT |
240 | for (i = 0; i < nr_trees; i++) { |
241 | struct tree *tree = trees[i]; | |
242 | parse_tree(tree); | |
243 | init_tree_desc(t+i, tree->buffer, tree->size); | |
244 | } | |
203a2fe1 DB |
245 | if (unpack_trees(nr_trees, t, &opts)) |
246 | return 128; | |
7927a55d | 247 | |
ea5070c9 | 248 | if (opts.debug_unpack || opts.dry_run) |
ba655da5 JH |
249 | return 0; /* do not write the index out */ |
250 | ||
7927a55d JH |
251 | /* |
252 | * When reading only one tree (either the most basic form, | |
253 | * "-m ent" or "--reset ent" form), we can obtain a fully | |
254 | * valid cache-tree because the index must match exactly | |
255 | * what came from the tree. | |
256 | */ | |
8cc21ce7 | 257 | if (nr_trees == 1 && !opts.prefix) |
e6c286e8 | 258 | prime_cache_tree(&the_index, trees[0]); |
7927a55d | 259 | |
03b86647 | 260 | if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK)) |
2de381f9 | 261 | die("unable to write new index file"); |
9614b8dc | 262 | return 0; |
e83c5163 | 263 | } |