1 #define NO_THE_INDEX_COMPATIBILITY_MACROS
6 #include "cache-tree.h"
7 #include "unpack-trees.h"
11 static void add_entry(struct unpack_trees_options *o, struct cache_entry *ce,
12 unsigned int set, unsigned int clear)
14 unsigned int size = ce_size(ce);
15 struct cache_entry *new = xmalloc(size);
17 clear |= CE_HASHED | CE_UNHASHED;
19 memcpy(new, ce, size);
21 new->ce_flags = (new->ce_flags & ~clear) | set;
22 add_index_entry(&o->result, new, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE|ADD_CACHE_SKIP_DFCHECK);
25 /* Unlink the last component and attempt to remove leading
26 * directories, in case this unlink is the removal of the
27 * last entry in the directory -- empty directories are removed.
29 static void unlink_entry(char *name, char *last_symlink)
33 if (has_symlink_leading_path(name, last_symlink))
40 cp = strrchr(name, '/');
56 static struct checkout state;
57 static void check_updates(struct unpack_trees_options *o)
59 unsigned cnt = 0, total = 0;
60 struct progress *progress = NULL;
61 char last_symlink[PATH_MAX];
62 struct index_state *index = &o->result;
65 if (o->update && o->verbose_update) {
66 for (total = cnt = 0; cnt < index->cache_nr; cnt++) {
67 struct cache_entry *ce = index->cache[cnt];
68 if (ce->ce_flags & (CE_UPDATE | CE_REMOVE))
72 progress = start_progress_delay("Checking out files",
78 for (i = 0; i < index->cache_nr; i++) {
79 struct cache_entry *ce = index->cache[i];
81 if (ce->ce_flags & (CE_UPDATE | CE_REMOVE))
82 display_progress(progress, ++cnt);
83 if (ce->ce_flags & CE_REMOVE) {
85 unlink_entry(ce->name, last_symlink);
86 remove_index_entry_at(&o->result, i);
90 if (ce->ce_flags & CE_UPDATE) {
91 ce->ce_flags &= ~CE_UPDATE;
93 checkout_entry(ce, &state, NULL);
98 stop_progress(&progress);
101 static inline int call_unpack_fn(struct cache_entry **src, struct unpack_trees_options *o)
103 int ret = o->fn(src, o);
109 static int unpack_index_entry(struct cache_entry *ce, struct unpack_trees_options *o)
111 struct cache_entry *src[5] = { ce, };
115 if (o->skip_unmerged) {
116 add_entry(o, ce, 0, 0);
120 return call_unpack_fn(src, o);
123 int traverse_trees_recursive(int n, unsigned long dirmask, unsigned long df_conflicts, struct name_entry *names, struct traverse_info *info)
126 struct tree_desc t[MAX_UNPACK_TREES];
127 struct traverse_info newinfo;
128 struct name_entry *p;
137 newinfo.pathlen += tree_entry_len(p->path, p->sha1) + 1;
138 newinfo.conflicts |= df_conflicts;
140 for (i = 0; i < n; i++, dirmask >>= 1) {
141 const unsigned char *sha1 = NULL;
143 sha1 = names[i].sha1;
144 fill_tree_descriptor(t+i, sha1);
146 return traverse_trees(n, t, &newinfo);
150 * Compare the traverse-path to the cache entry without actually
151 * having to generate the textual representation of the traverse
154 * NOTE! This *only* compares up to the size of the traverse path
155 * itself - the caller needs to do the final check for the cache
156 * entry having more data at the end!
158 static int do_compare_entry(const struct cache_entry *ce, const struct traverse_info *info, const struct name_entry *n)
160 int len, pathlen, ce_len;
164 int cmp = do_compare_entry(ce, info->prev, &info->name);
168 pathlen = info->pathlen;
169 ce_len = ce_namelen(ce);
171 /* If ce_len < pathlen then we must have previously hit "name == directory" entry */
172 if (ce_len < pathlen)
176 ce_name = ce->name + pathlen;
178 len = tree_entry_len(n->path, n->sha1);
179 return df_name_compare(ce_name, ce_len, S_IFREG, n->path, len, n->mode);
182 static int compare_entry(const struct cache_entry *ce, const struct traverse_info *info, const struct name_entry *n)
184 int cmp = do_compare_entry(ce, info, n);
189 * Even if the beginning compared identically, the ce should
190 * compare as bigger than a directory leading up to it!
192 return ce_namelen(ce) > traverse_path_len(info, n);
195 static struct cache_entry *create_ce_entry(const struct traverse_info *info, const struct name_entry *n, int stage)
197 int len = traverse_path_len(info, n);
198 struct cache_entry *ce = xcalloc(1, cache_entry_size(len));
200 ce->ce_mode = create_ce_mode(n->mode);
201 ce->ce_flags = create_ce_flags(len, stage);
202 hashcpy(ce->sha1, n->sha1);
203 make_traverse_path(ce->name, info, n);
208 static int unpack_nondirectories(int n, unsigned long mask, unsigned long dirmask, struct cache_entry *src[5],
209 const struct name_entry *names, const struct traverse_info *info)
212 struct unpack_trees_options *o = info->data;
213 unsigned long conflicts;
215 /* Do we have *only* directories? Nothing to do */
216 if (mask == dirmask && !src[0])
219 conflicts = info->conflicts;
222 conflicts |= dirmask;
225 * Ok, we've filled in up to any potential index entry in src[0],
228 for (i = 0; i < n; i++) {
230 unsigned int bit = 1ul << i;
231 if (conflicts & bit) {
232 src[i + o->merge] = o->df_conflict_entry;
239 else if (i + 1 < o->head_idx)
241 else if (i + 1 > o->head_idx)
245 src[i + o->merge] = create_ce_entry(info, names + i, stage);
249 return call_unpack_fn(src, o);
252 for (i = 0; i < n; i++)
253 add_entry(o, src[i], 0, 0);
257 static int unpack_callback(int n, unsigned long mask, unsigned long dirmask, struct name_entry *names, struct traverse_info *info)
259 struct cache_entry *src[5] = { NULL, };
260 struct unpack_trees_options *o = info->data;
261 const struct name_entry *p = names;
263 /* Find first entry with a real name (we could use "mask" too) */
267 /* Are we supposed to look at the index too? */
269 while (o->pos < o->src_index->cache_nr) {
270 struct cache_entry *ce = o->src_index->cache[o->pos];
271 int cmp = compare_entry(ce, info, p);
273 if (unpack_index_entry(ce, o) < 0)
281 * If we skip unmerged index entries, we'll skip this
282 * entry *and* the tree entries associated with it!
284 if (o->skip_unmerged) {
285 add_entry(o, ce, 0, 0);
295 if (unpack_nondirectories(n, mask, dirmask, src, names, info) < 0)
298 /* Now handle any directories.. */
300 unsigned long conflicts = mask & ~dirmask;
306 if (traverse_trees_recursive(n, dirmask, conflicts,
315 static int unpack_failed(struct unpack_trees_options *o, const char *message)
317 discard_index(&o->result);
320 return error(message);
326 int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options *o)
328 static struct cache_entry *dfc;
330 if (len > MAX_UNPACK_TREES)
331 die("unpack_trees takes at most %d trees", MAX_UNPACK_TREES);
332 memset(&state, 0, sizeof(state));
336 state.refresh_cache = 1;
338 memset(&o->result, 0, sizeof(o->result));
340 o->result.timestamp = o->src_index->timestamp;
344 dfc = xcalloc(1, sizeof(struct cache_entry) + 1);
345 o->df_conflict_entry = dfc;
348 const char *prefix = o->prefix ? o->prefix : "";
349 struct traverse_info info;
351 setup_traverse_info(&info, prefix);
352 info.fn = unpack_callback;
355 if (traverse_trees(len, t, &info) < 0)
356 return unpack_failed(o, NULL);
359 /* Any left-over entries in the index? */
361 while (o->pos < o->src_index->cache_nr) {
362 struct cache_entry *ce = o->src_index->cache[o->pos];
363 if (unpack_index_entry(ce, o) < 0)
364 return unpack_failed(o, NULL);
368 if (o->trivial_merges_only && o->nontrivial_merge)
369 return unpack_failed(o, "Merge requires file-level merging");
374 *o->dst_index = o->result;
378 /* Here come the merge functions */
380 static int reject_merge(struct cache_entry *ce)
382 return error("Entry '%s' would be overwritten by merge. Cannot merge.",
386 static int same(struct cache_entry *a, struct cache_entry *b)
392 return a->ce_mode == b->ce_mode &&
393 !hashcmp(a->sha1, b->sha1);
398 * When a CE gets turned into an unmerged entry, we
399 * want it to be up-to-date
401 static int verify_uptodate(struct cache_entry *ce,
402 struct unpack_trees_options *o)
406 if (o->index_only || o->reset)
409 if (!lstat(ce->name, &st)) {
410 unsigned changed = ie_match_stat(o->src_index, ce, &st, CE_MATCH_IGNORE_VALID);
414 * NEEDSWORK: the current default policy is to allow
415 * submodule to be out of sync wrt the supermodule
416 * index. This needs to be tightened later for
417 * submodules that are marked to be automatically
420 if (S_ISGITLINK(ce->ce_mode))
426 return o->gently ? -1 :
427 error("Entry '%s' not uptodate. Cannot merge.", ce->name);
430 static void invalidate_ce_path(struct cache_entry *ce, struct unpack_trees_options *o)
433 cache_tree_invalidate_path(o->src_index->cache_tree, ce->name);
437 * Check that checking out ce->sha1 in subdir ce->name is not
438 * going to overwrite any working files.
440 * Currently, git does not checkout subprojects during a superproject
441 * checkout, so it is not going to overwrite anything.
443 static int verify_clean_submodule(struct cache_entry *ce, const char *action,
444 struct unpack_trees_options *o)
449 static int verify_clean_subdirectory(struct cache_entry *ce, const char *action,
450 struct unpack_trees_options *o)
453 * we are about to extract "ce->name"; we would not want to lose
454 * anything in the existing directory there.
461 unsigned char sha1[20];
463 if (S_ISGITLINK(ce->ce_mode) &&
464 resolve_gitlink_ref(ce->name, "HEAD", sha1) == 0) {
465 /* If we are not going to update the submodule, then
468 if (!hashcmp(sha1, ce->sha1))
470 return verify_clean_submodule(ce, action, o);
474 * First let's make sure we do not have a local modification
477 namelen = strlen(ce->name);
478 pos = index_name_pos(o->src_index, ce->name, namelen);
480 return cnt; /* we have it as nondirectory */
482 for (i = pos; i < o->src_index->cache_nr; i++) {
483 struct cache_entry *ce = o->src_index->cache[i];
484 int len = ce_namelen(ce);
486 strncmp(ce->name, ce->name, namelen) ||
487 ce->name[namelen] != '/')
490 * ce->name is an entry in the subdirectory.
493 if (verify_uptodate(ce, o))
495 add_entry(o, ce, CE_REMOVE, 0);
501 * Then we need to make sure that we do not lose a locally
502 * present file that is not ignored.
504 pathbuf = xmalloc(namelen + 2);
505 memcpy(pathbuf, ce->name, namelen);
506 strcpy(pathbuf+namelen, "/");
508 memset(&d, 0, sizeof(d));
510 d.exclude_per_dir = o->dir->exclude_per_dir;
511 i = read_directory(&d, ce->name, pathbuf, namelen+1, NULL);
513 return o->gently ? -1 :
514 error("Updating '%s' would lose untracked files in it",
521 * We do not want to remove or overwrite a working tree file that
522 * is not tracked, unless it is ignored.
524 static int verify_absent(struct cache_entry *ce, const char *action,
525 struct unpack_trees_options *o)
529 if (o->index_only || o->reset || !o->update)
532 if (has_symlink_leading_path(ce->name, NULL))
535 if (!lstat(ce->name, &st)) {
537 int dtype = ce_to_dtype(ce);
539 if (o->dir && excluded(o->dir, ce->name, &dtype))
541 * ce->name is explicitly excluded, so it is Ok to
545 if (S_ISDIR(st.st_mode)) {
547 * We are checking out path "foo" and
548 * found "foo/." in the working tree.
549 * This is tricky -- if we have modified
550 * files that are in "foo/" we would lose
553 cnt = verify_clean_subdirectory(ce, action, o);
556 * If this removed entries from the index,
557 * what that means is:
559 * (1) the caller unpack_trees_rec() saw path/foo
560 * in the index, and it has not removed it because
561 * it thinks it is handling 'path' as blob with
563 * (2) we will return "ok, we placed a merged entry
564 * in the index" which would cause o->pos to be
565 * incremented by one;
566 * (3) however, original o->pos now has 'path/foo'
567 * marked with "to be removed".
569 * We need to increment it by the number of
570 * deleted entries here.
577 * The previous round may already have decided to
578 * delete this path, which is in a subdirectory that
579 * is being replaced with a blob.
581 cnt = index_name_pos(&o->result, ce->name, strlen(ce->name));
583 struct cache_entry *ce = o->result.cache[cnt];
584 if (ce->ce_flags & CE_REMOVE)
588 return o->gently ? -1 :
589 error("Untracked working tree file '%s' "
590 "would be %s by merge.", ce->name, action);
595 static int merged_entry(struct cache_entry *merge, struct cache_entry *old,
596 struct unpack_trees_options *o)
598 int update = CE_UPDATE;
602 * See if we can re-use the old CE directly?
603 * That way we get the uptodate stat info.
605 * This also removes the UPDATE flag on a match; otherwise
606 * we will end up overwriting local changes in the work tree.
608 if (same(old, merge)) {
609 copy_cache_entry(merge, old);
612 if (verify_uptodate(old, o))
614 invalidate_ce_path(old, o);
618 if (verify_absent(merge, "overwritten", o))
620 invalidate_ce_path(merge, o);
623 add_entry(o, merge, update, CE_STAGEMASK);
627 static int deleted_entry(struct cache_entry *ce, struct cache_entry *old,
628 struct unpack_trees_options *o)
630 /* Did it exist in the index? */
632 if (verify_absent(ce, "removed", o))
636 if (verify_uptodate(old, o))
638 add_entry(o, ce, CE_REMOVE, 0);
639 invalidate_ce_path(ce, o);
643 static int keep_entry(struct cache_entry *ce, struct unpack_trees_options *o)
645 add_entry(o, ce, 0, 0);
650 static void show_stage_entry(FILE *o,
651 const char *label, const struct cache_entry *ce)
654 fprintf(o, "%s (missing)\n", label);
656 fprintf(o, "%s%06o %s %d\t%s\n",
659 sha1_to_hex(ce->sha1),
665 int threeway_merge(struct cache_entry **stages, struct unpack_trees_options *o)
667 struct cache_entry *index;
668 struct cache_entry *head;
669 struct cache_entry *remote = stages[o->head_idx + 1];
672 int remote_match = 0;
674 int df_conflict_head = 0;
675 int df_conflict_remote = 0;
677 int any_anc_missing = 0;
678 int no_anc_exists = 1;
681 for (i = 1; i < o->head_idx; i++) {
682 if (!stages[i] || stages[i] == o->df_conflict_entry)
689 head = stages[o->head_idx];
691 if (head == o->df_conflict_entry) {
692 df_conflict_head = 1;
696 if (remote == o->df_conflict_entry) {
697 df_conflict_remote = 1;
701 /* First, if there's a #16 situation, note that to prevent #13
704 if (!same(remote, head)) {
705 for (i = 1; i < o->head_idx; i++) {
706 if (same(stages[i], head)) {
709 if (same(stages[i], remote)) {
715 /* We start with cases where the index is allowed to match
716 * something other than the head: #14(ALT) and #2ALT, where it
717 * is permitted to match the result instead.
719 /* #14, #14ALT, #2ALT */
720 if (remote && !df_conflict_head && head_match && !remote_match) {
721 if (index && !same(index, remote) && !same(index, head))
722 return o->gently ? -1 : reject_merge(index);
723 return merged_entry(remote, index, o);
726 * If we have an entry in the index cache, then we want to
727 * make sure that it matches head.
729 if (index && !same(index, head))
730 return o->gently ? -1 : reject_merge(index);
734 if (same(head, remote))
735 return merged_entry(head, index, o);
737 if (!df_conflict_remote && remote_match && !head_match)
738 return merged_entry(head, index, o);
742 if (!head && !remote && any_anc_missing)
745 /* Under the new "aggressive" rule, we resolve mostly trivial
746 * cases that we historically had git-merge-one-file resolve.
749 int head_deleted = !head && !df_conflict_head;
750 int remote_deleted = !remote && !df_conflict_remote;
751 struct cache_entry *ce = NULL;
760 for (i = 1; i < o->head_idx; i++) {
761 if (stages[i] && stages[i] != o->df_conflict_entry) {
770 * Deleted in one and unchanged in the other.
772 if ((head_deleted && remote_deleted) ||
773 (head_deleted && remote && remote_match) ||
774 (remote_deleted && head && head_match)) {
776 return deleted_entry(index, index, o);
777 if (ce && !head_deleted) {
778 if (verify_absent(ce, "removed", o))
784 * Added in both, identically.
786 if (no_anc_exists && head && remote && same(head, remote))
787 return merged_entry(head, index, o);
791 /* Below are "no merge" cases, which require that the index be
792 * up-to-date to avoid the files getting overwritten with
793 * conflict resolution files.
796 if (verify_uptodate(index, o))
800 o->nontrivial_merge = 1;
802 /* #2, #3, #4, #6, #7, #9, #10, #11. */
804 if (!head_match || !remote_match) {
805 for (i = 1; i < o->head_idx; i++) {
806 if (stages[i] && stages[i] != o->df_conflict_entry) {
807 keep_entry(stages[i], o);
815 fprintf(stderr, "read-tree: warning #16 detected\n");
816 show_stage_entry(stderr, "head ", stages[head_match]);
817 show_stage_entry(stderr, "remote ", stages[remote_match]);
820 if (head) { count += keep_entry(head, o); }
821 if (remote) { count += keep_entry(remote, o); }
828 * The rule is to "carry forward" what is in the index without losing
829 * information across a "fast forward", favoring a successful merge
830 * over a merge failure when it makes sense. For details of the
831 * "carry forward" rule, please see <Documentation/git-read-tree.txt>.
834 int twoway_merge(struct cache_entry **src, struct unpack_trees_options *o)
836 struct cache_entry *current = src[0];
837 struct cache_entry *oldtree = src[1];
838 struct cache_entry *newtree = src[2];
840 if (o->merge_size != 2)
841 return error("Cannot do a twoway merge of %d trees",
844 if (oldtree == o->df_conflict_entry)
846 if (newtree == o->df_conflict_entry)
850 if ((!oldtree && !newtree) || /* 4 and 5 */
851 (!oldtree && newtree &&
852 same(current, newtree)) || /* 6 and 7 */
853 (oldtree && newtree &&
854 same(oldtree, newtree)) || /* 14 and 15 */
855 (oldtree && newtree &&
856 !same(oldtree, newtree) && /* 18 and 19 */
857 same(current, newtree))) {
858 return keep_entry(current, o);
860 else if (oldtree && !newtree && same(current, oldtree)) {
862 return deleted_entry(oldtree, current, o);
864 else if (oldtree && newtree &&
865 same(current, oldtree) && !same(current, newtree)) {
867 return merged_entry(newtree, current, o);
870 /* all other failures */
872 return o->gently ? -1 : reject_merge(oldtree);
874 return o->gently ? -1 : reject_merge(current);
876 return o->gently ? -1 : reject_merge(newtree);
881 return merged_entry(newtree, current, o);
882 return deleted_entry(oldtree, current, o);
888 * Keep the index entries at stage0, collapse stage1 but make sure
889 * stage0 does not have anything there.
891 int bind_merge(struct cache_entry **src,
892 struct unpack_trees_options *o)
894 struct cache_entry *old = src[0];
895 struct cache_entry *a = src[1];
897 if (o->merge_size != 1)
898 return error("Cannot do a bind merge of %d trees\n",
901 return o->gently ? -1 :
902 error("Entry '%s' overlaps with '%s'. Cannot bind.", a->name, old->name);
904 return keep_entry(old, o);
906 return merged_entry(a, NULL, o);
913 * - take the stat information from stage0, take the data from stage1
915 int oneway_merge(struct cache_entry **src, struct unpack_trees_options *o)
917 struct cache_entry *old = src[0];
918 struct cache_entry *a = src[1];
920 if (o->merge_size != 1)
921 return error("Cannot do a oneway merge of %d trees",
925 return deleted_entry(old, old, o);
927 if (old && same(old, a)) {
931 if (lstat(old->name, &st) ||
932 ie_match_stat(o->src_index, old, &st, CE_MATCH_IGNORE_VALID))
935 add_entry(o, old, update, 0);
938 return merged_entry(a, old, o);