Fix 'git diff --no-index' with a non-existing symlink target
[git/spearce.git] / unpack-trees.c
blob16bc2ca9eb0fe46b90969ba4855d9b4d89369f42
1 #define NO_THE_INDEX_COMPATIBILITY_MACROS
2 #include "cache.h"
3 #include "dir.h"
4 #include "tree.h"
5 #include "tree-walk.h"
6 #include "cache-tree.h"
7 #include "unpack-trees.h"
8 #include "progress.h"
9 #include "refs.h"
12 * Error messages expected by scripts out of plumbing commands such as
13 * read-tree. Non-scripted Porcelain is not required to use these messages
14 * and in fact are encouraged to reword them to better suit their particular
15 * situation better. See how "git checkout" replaces not_uptodate_file to
16 * explain why it does not allow switching between branches when you have
17 * local changes, for example.
19 static struct unpack_trees_error_msgs unpack_plumbing_errors = {
20 /* would_overwrite */
21 "Entry '%s' would be overwritten by merge. Cannot merge.",
23 /* not_uptodate_file */
24 "Entry '%s' not uptodate. Cannot merge.",
26 /* not_uptodate_dir */
27 "Updating '%s' would lose untracked files in it",
29 /* would_lose_untracked */
30 "Untracked working tree file '%s' would be %s by merge.",
32 /* bind_overlap */
33 "Entry '%s' overlaps with '%s'. Cannot bind.",
36 #define ERRORMSG(o,fld) \
37 ( ((o) && (o)->msgs.fld) \
38 ? ((o)->msgs.fld) \
39 : (unpack_plumbing_errors.fld) )
41 static void add_entry(struct unpack_trees_options *o, struct cache_entry *ce,
42 unsigned int set, unsigned int clear)
44 unsigned int size = ce_size(ce);
45 struct cache_entry *new = xmalloc(size);
47 clear |= CE_HASHED | CE_UNHASHED;
49 memcpy(new, ce, size);
50 new->next = NULL;
51 new->ce_flags = (new->ce_flags & ~clear) | set;
52 add_index_entry(&o->result, new, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE|ADD_CACHE_SKIP_DFCHECK);
55 /* Unlink the last component and attempt to remove leading
56 * directories, in case this unlink is the removal of the
57 * last entry in the directory -- empty directories are removed.
59 static void unlink_entry(struct cache_entry *ce)
61 char *cp, *prev;
62 char *name = ce->name;
64 if (has_symlink_or_noent_leading_path(ce_namelen(ce), ce->name))
65 return;
66 if (unlink(name))
67 return;
68 prev = NULL;
69 while (1) {
70 int status;
71 cp = strrchr(name, '/');
72 if (prev)
73 *prev = '/';
74 if (!cp)
75 break;
77 *cp = 0;
78 status = rmdir(name);
79 if (status) {
80 *cp = '/';
81 break;
83 prev = cp;
87 static struct checkout state;
88 static int check_updates(struct unpack_trees_options *o)
90 unsigned cnt = 0, total = 0;
91 struct progress *progress = NULL;
92 struct index_state *index = &o->result;
93 int i;
94 int errs = 0;
96 if (o->update && o->verbose_update) {
97 for (total = cnt = 0; cnt < index->cache_nr; cnt++) {
98 struct cache_entry *ce = index->cache[cnt];
99 if (ce->ce_flags & (CE_UPDATE | CE_REMOVE))
100 total++;
103 progress = start_progress_delay("Checking out files",
104 total, 50, 1);
105 cnt = 0;
108 for (i = 0; i < index->cache_nr; i++) {
109 struct cache_entry *ce = index->cache[i];
111 if (ce->ce_flags & CE_REMOVE) {
112 display_progress(progress, ++cnt);
113 if (o->update)
114 unlink_entry(ce);
115 remove_index_entry_at(&o->result, i);
116 i--;
117 continue;
121 for (i = 0; i < index->cache_nr; i++) {
122 struct cache_entry *ce = index->cache[i];
124 if (ce->ce_flags & CE_UPDATE) {
125 display_progress(progress, ++cnt);
126 ce->ce_flags &= ~CE_UPDATE;
127 if (o->update) {
128 errs |= checkout_entry(ce, &state, NULL);
132 stop_progress(&progress);
133 return errs != 0;
136 static inline int call_unpack_fn(struct cache_entry **src, struct unpack_trees_options *o)
138 int ret = o->fn(src, o);
139 if (ret > 0)
140 ret = 0;
141 return ret;
144 static int unpack_index_entry(struct cache_entry *ce, struct unpack_trees_options *o)
146 struct cache_entry *src[5] = { ce, };
148 o->pos++;
149 if (ce_stage(ce)) {
150 if (o->skip_unmerged) {
151 add_entry(o, ce, 0, 0);
152 return 0;
155 return call_unpack_fn(src, o);
158 int traverse_trees_recursive(int n, unsigned long dirmask, unsigned long df_conflicts, struct name_entry *names, struct traverse_info *info)
160 int i;
161 struct tree_desc t[MAX_UNPACK_TREES];
162 struct traverse_info newinfo;
163 struct name_entry *p;
165 p = names;
166 while (!p->mode)
167 p++;
169 newinfo = *info;
170 newinfo.prev = info;
171 newinfo.name = *p;
172 newinfo.pathlen += tree_entry_len(p->path, p->sha1) + 1;
173 newinfo.conflicts |= df_conflicts;
175 for (i = 0; i < n; i++, dirmask >>= 1) {
176 const unsigned char *sha1 = NULL;
177 if (dirmask & 1)
178 sha1 = names[i].sha1;
179 fill_tree_descriptor(t+i, sha1);
181 return traverse_trees(n, t, &newinfo);
185 * Compare the traverse-path to the cache entry without actually
186 * having to generate the textual representation of the traverse
187 * path.
189 * NOTE! This *only* compares up to the size of the traverse path
190 * itself - the caller needs to do the final check for the cache
191 * entry having more data at the end!
193 static int do_compare_entry(const struct cache_entry *ce, const struct traverse_info *info, const struct name_entry *n)
195 int len, pathlen, ce_len;
196 const char *ce_name;
198 if (info->prev) {
199 int cmp = do_compare_entry(ce, info->prev, &info->name);
200 if (cmp)
201 return cmp;
203 pathlen = info->pathlen;
204 ce_len = ce_namelen(ce);
206 /* If ce_len < pathlen then we must have previously hit "name == directory" entry */
207 if (ce_len < pathlen)
208 return -1;
210 ce_len -= pathlen;
211 ce_name = ce->name + pathlen;
213 len = tree_entry_len(n->path, n->sha1);
214 return df_name_compare(ce_name, ce_len, S_IFREG, n->path, len, n->mode);
217 static int compare_entry(const struct cache_entry *ce, const struct traverse_info *info, const struct name_entry *n)
219 int cmp = do_compare_entry(ce, info, n);
220 if (cmp)
221 return cmp;
224 * Even if the beginning compared identically, the ce should
225 * compare as bigger than a directory leading up to it!
227 return ce_namelen(ce) > traverse_path_len(info, n);
230 static struct cache_entry *create_ce_entry(const struct traverse_info *info, const struct name_entry *n, int stage)
232 int len = traverse_path_len(info, n);
233 struct cache_entry *ce = xcalloc(1, cache_entry_size(len));
235 ce->ce_mode = create_ce_mode(n->mode);
236 ce->ce_flags = create_ce_flags(len, stage);
237 hashcpy(ce->sha1, n->sha1);
238 make_traverse_path(ce->name, info, n);
240 return ce;
243 static int unpack_nondirectories(int n, unsigned long mask, unsigned long dirmask, struct cache_entry *src[5],
244 const struct name_entry *names, const struct traverse_info *info)
246 int i;
247 struct unpack_trees_options *o = info->data;
248 unsigned long conflicts;
250 /* Do we have *only* directories? Nothing to do */
251 if (mask == dirmask && !src[0])
252 return 0;
254 conflicts = info->conflicts;
255 if (o->merge)
256 conflicts >>= 1;
257 conflicts |= dirmask;
260 * Ok, we've filled in up to any potential index entry in src[0],
261 * now do the rest.
263 for (i = 0; i < n; i++) {
264 int stage;
265 unsigned int bit = 1ul << i;
266 if (conflicts & bit) {
267 src[i + o->merge] = o->df_conflict_entry;
268 continue;
270 if (!(mask & bit))
271 continue;
272 if (!o->merge)
273 stage = 0;
274 else if (i + 1 < o->head_idx)
275 stage = 1;
276 else if (i + 1 > o->head_idx)
277 stage = 3;
278 else
279 stage = 2;
280 src[i + o->merge] = create_ce_entry(info, names + i, stage);
283 if (o->merge)
284 return call_unpack_fn(src, o);
286 n += o->merge;
287 for (i = 0; i < n; i++)
288 add_entry(o, src[i], 0, 0);
289 return 0;
292 static int unpack_callback(int n, unsigned long mask, unsigned long dirmask, struct name_entry *names, struct traverse_info *info)
294 struct cache_entry *src[5] = { NULL, };
295 struct unpack_trees_options *o = info->data;
296 const struct name_entry *p = names;
298 /* Find first entry with a real name (we could use "mask" too) */
299 while (!p->mode)
300 p++;
302 /* Are we supposed to look at the index too? */
303 if (o->merge) {
304 while (o->pos < o->src_index->cache_nr) {
305 struct cache_entry *ce = o->src_index->cache[o->pos];
306 int cmp = compare_entry(ce, info, p);
307 if (cmp < 0) {
308 if (unpack_index_entry(ce, o) < 0)
309 return -1;
310 continue;
312 if (!cmp) {
313 o->pos++;
314 if (ce_stage(ce)) {
316 * If we skip unmerged index entries, we'll skip this
317 * entry *and* the tree entries associated with it!
319 if (o->skip_unmerged) {
320 add_entry(o, ce, 0, 0);
321 return mask;
324 src[0] = ce;
326 break;
330 if (unpack_nondirectories(n, mask, dirmask, src, names, info) < 0)
331 return -1;
333 /* Now handle any directories.. */
334 if (dirmask) {
335 unsigned long conflicts = mask & ~dirmask;
336 if (o->merge) {
337 conflicts <<= 1;
338 if (src[0])
339 conflicts |= 1;
341 if (traverse_trees_recursive(n, dirmask, conflicts,
342 names, info) < 0)
343 return -1;
344 return mask;
347 return mask;
350 static int unpack_failed(struct unpack_trees_options *o, const char *message)
352 discard_index(&o->result);
353 if (!o->gently) {
354 if (message)
355 return error("%s", message);
356 return -1;
358 return -1;
362 * N-way merge "len" trees. Returns 0 on success, -1 on failure to manipulate the
363 * resulting index, -2 on failure to reflect the changes to the work tree.
365 int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options *o)
367 int ret;
368 static struct cache_entry *dfc;
370 if (len > MAX_UNPACK_TREES)
371 die("unpack_trees takes at most %d trees", MAX_UNPACK_TREES);
372 memset(&state, 0, sizeof(state));
373 state.base_dir = "";
374 state.force = 1;
375 state.quiet = 1;
376 state.refresh_cache = 1;
378 memset(&o->result, 0, sizeof(o->result));
379 o->result.initialized = 1;
380 if (o->src_index)
381 o->result.timestamp = o->src_index->timestamp;
382 o->merge_size = len;
384 if (!dfc)
385 dfc = xcalloc(1, cache_entry_size(0));
386 o->df_conflict_entry = dfc;
388 if (len) {
389 const char *prefix = o->prefix ? o->prefix : "";
390 struct traverse_info info;
392 setup_traverse_info(&info, prefix);
393 info.fn = unpack_callback;
394 info.data = o;
396 if (traverse_trees(len, t, &info) < 0)
397 return unpack_failed(o, NULL);
400 /* Any left-over entries in the index? */
401 if (o->merge) {
402 while (o->pos < o->src_index->cache_nr) {
403 struct cache_entry *ce = o->src_index->cache[o->pos];
404 if (unpack_index_entry(ce, o) < 0)
405 return unpack_failed(o, NULL);
409 if (o->trivial_merges_only && o->nontrivial_merge)
410 return unpack_failed(o, "Merge requires file-level merging");
412 o->src_index = NULL;
413 ret = check_updates(o) ? (-2) : 0;
414 if (o->dst_index)
415 *o->dst_index = o->result;
416 return ret;
419 /* Here come the merge functions */
421 static int reject_merge(struct cache_entry *ce, struct unpack_trees_options *o)
423 return error(ERRORMSG(o, would_overwrite), ce->name);
426 static int same(struct cache_entry *a, struct cache_entry *b)
428 if (!!a != !!b)
429 return 0;
430 if (!a && !b)
431 return 1;
432 return a->ce_mode == b->ce_mode &&
433 !hashcmp(a->sha1, b->sha1);
438 * When a CE gets turned into an unmerged entry, we
439 * want it to be up-to-date
441 static int verify_uptodate(struct cache_entry *ce,
442 struct unpack_trees_options *o)
444 struct stat st;
446 if (o->index_only || o->reset)
447 return 0;
449 if (!lstat(ce->name, &st)) {
450 unsigned changed = ie_match_stat(o->src_index, ce, &st, CE_MATCH_IGNORE_VALID);
451 if (!changed)
452 return 0;
454 * NEEDSWORK: the current default policy is to allow
455 * submodule to be out of sync wrt the supermodule
456 * index. This needs to be tightened later for
457 * submodules that are marked to be automatically
458 * checked out.
460 if (S_ISGITLINK(ce->ce_mode))
461 return 0;
462 errno = 0;
464 if (errno == ENOENT)
465 return 0;
466 return o->gently ? -1 :
467 error(ERRORMSG(o, not_uptodate_file), ce->name);
470 static void invalidate_ce_path(struct cache_entry *ce, struct unpack_trees_options *o)
472 if (ce)
473 cache_tree_invalidate_path(o->src_index->cache_tree, ce->name);
477 * Check that checking out ce->sha1 in subdir ce->name is not
478 * going to overwrite any working files.
480 * Currently, git does not checkout subprojects during a superproject
481 * checkout, so it is not going to overwrite anything.
483 static int verify_clean_submodule(struct cache_entry *ce, const char *action,
484 struct unpack_trees_options *o)
486 return 0;
489 static int verify_clean_subdirectory(struct cache_entry *ce, const char *action,
490 struct unpack_trees_options *o)
493 * we are about to extract "ce->name"; we would not want to lose
494 * anything in the existing directory there.
496 int namelen;
497 int i;
498 struct dir_struct d;
499 char *pathbuf;
500 int cnt = 0;
501 unsigned char sha1[20];
503 if (S_ISGITLINK(ce->ce_mode) &&
504 resolve_gitlink_ref(ce->name, "HEAD", sha1) == 0) {
505 /* If we are not going to update the submodule, then
506 * we don't care.
508 if (!hashcmp(sha1, ce->sha1))
509 return 0;
510 return verify_clean_submodule(ce, action, o);
514 * First let's make sure we do not have a local modification
515 * in that directory.
517 namelen = strlen(ce->name);
518 for (i = o->pos; i < o->src_index->cache_nr; i++) {
519 struct cache_entry *ce2 = o->src_index->cache[i];
520 int len = ce_namelen(ce2);
521 if (len < namelen ||
522 strncmp(ce->name, ce2->name, namelen) ||
523 ce2->name[namelen] != '/')
524 break;
526 * ce2->name is an entry in the subdirectory.
528 if (!ce_stage(ce2)) {
529 if (verify_uptodate(ce2, o))
530 return -1;
531 add_entry(o, ce2, CE_REMOVE, 0);
533 cnt++;
537 * Then we need to make sure that we do not lose a locally
538 * present file that is not ignored.
540 pathbuf = xmalloc(namelen + 2);
541 memcpy(pathbuf, ce->name, namelen);
542 strcpy(pathbuf+namelen, "/");
544 memset(&d, 0, sizeof(d));
545 if (o->dir)
546 d.exclude_per_dir = o->dir->exclude_per_dir;
547 i = read_directory(&d, ce->name, pathbuf, namelen+1, NULL);
548 if (i)
549 return o->gently ? -1 :
550 error(ERRORMSG(o, not_uptodate_dir), ce->name);
551 free(pathbuf);
552 return cnt;
556 * This gets called when there was no index entry for the tree entry 'dst',
557 * but we found a file in the working tree that 'lstat()' said was fine,
558 * and we're on a case-insensitive filesystem.
560 * See if we can find a case-insensitive match in the index that also
561 * matches the stat information, and assume it's that other file!
563 static int icase_exists(struct unpack_trees_options *o, struct cache_entry *dst, struct stat *st)
565 struct cache_entry *src;
567 src = index_name_exists(o->src_index, dst->name, ce_namelen(dst), 1);
568 return src && !ie_match_stat(o->src_index, src, st, CE_MATCH_IGNORE_VALID);
572 * We do not want to remove or overwrite a working tree file that
573 * is not tracked, unless it is ignored.
575 static int verify_absent(struct cache_entry *ce, const char *action,
576 struct unpack_trees_options *o)
578 struct stat st;
580 if (o->index_only || o->reset || !o->update)
581 return 0;
583 if (has_symlink_or_noent_leading_path(ce_namelen(ce), ce->name))
584 return 0;
586 if (!lstat(ce->name, &st)) {
587 int ret;
588 int dtype = ce_to_dtype(ce);
589 struct cache_entry *result;
592 * It may be that the 'lstat()' succeeded even though
593 * target 'ce' was absent, because there is an old
594 * entry that is different only in case..
596 * Ignore that lstat() if it matches.
598 if (ignore_case && icase_exists(o, ce, &st))
599 return 0;
601 if (o->dir && excluded(o->dir, ce->name, &dtype))
603 * ce->name is explicitly excluded, so it is Ok to
604 * overwrite it.
606 return 0;
607 if (S_ISDIR(st.st_mode)) {
609 * We are checking out path "foo" and
610 * found "foo/." in the working tree.
611 * This is tricky -- if we have modified
612 * files that are in "foo/" we would lose
613 * it.
615 ret = verify_clean_subdirectory(ce, action, o);
616 if (ret < 0)
617 return ret;
620 * If this removed entries from the index,
621 * what that means is:
623 * (1) the caller unpack_callback() saw path/foo
624 * in the index, and it has not removed it because
625 * it thinks it is handling 'path' as blob with
626 * D/F conflict;
627 * (2) we will return "ok, we placed a merged entry
628 * in the index" which would cause o->pos to be
629 * incremented by one;
630 * (3) however, original o->pos now has 'path/foo'
631 * marked with "to be removed".
633 * We need to increment it by the number of
634 * deleted entries here.
636 o->pos += ret;
637 return 0;
641 * The previous round may already have decided to
642 * delete this path, which is in a subdirectory that
643 * is being replaced with a blob.
645 result = index_name_exists(&o->result, ce->name, ce_namelen(ce), 0);
646 if (result) {
647 if (result->ce_flags & CE_REMOVE)
648 return 0;
651 return o->gently ? -1 :
652 error(ERRORMSG(o, would_lose_untracked), ce->name, action);
654 return 0;
657 static int merged_entry(struct cache_entry *merge, struct cache_entry *old,
658 struct unpack_trees_options *o)
660 int update = CE_UPDATE;
662 if (old) {
664 * See if we can re-use the old CE directly?
665 * That way we get the uptodate stat info.
667 * This also removes the UPDATE flag on a match; otherwise
668 * we will end up overwriting local changes in the work tree.
670 if (same(old, merge)) {
671 copy_cache_entry(merge, old);
672 update = 0;
673 } else {
674 if (verify_uptodate(old, o))
675 return -1;
676 invalidate_ce_path(old, o);
679 else {
680 if (verify_absent(merge, "overwritten", o))
681 return -1;
682 invalidate_ce_path(merge, o);
685 add_entry(o, merge, update, CE_STAGEMASK);
686 return 1;
689 static int deleted_entry(struct cache_entry *ce, struct cache_entry *old,
690 struct unpack_trees_options *o)
692 /* Did it exist in the index? */
693 if (!old) {
694 if (verify_absent(ce, "removed", o))
695 return -1;
696 return 0;
698 if (verify_uptodate(old, o))
699 return -1;
700 add_entry(o, ce, CE_REMOVE, 0);
701 invalidate_ce_path(ce, o);
702 return 1;
705 static int keep_entry(struct cache_entry *ce, struct unpack_trees_options *o)
707 add_entry(o, ce, 0, 0);
708 return 1;
711 #if DBRT_DEBUG
712 static void show_stage_entry(FILE *o,
713 const char *label, const struct cache_entry *ce)
715 if (!ce)
716 fprintf(o, "%s (missing)\n", label);
717 else
718 fprintf(o, "%s%06o %s %d\t%s\n",
719 label,
720 ce->ce_mode,
721 sha1_to_hex(ce->sha1),
722 ce_stage(ce),
723 ce->name);
725 #endif
727 int threeway_merge(struct cache_entry **stages, struct unpack_trees_options *o)
729 struct cache_entry *index;
730 struct cache_entry *head;
731 struct cache_entry *remote = stages[o->head_idx + 1];
732 int count;
733 int head_match = 0;
734 int remote_match = 0;
736 int df_conflict_head = 0;
737 int df_conflict_remote = 0;
739 int any_anc_missing = 0;
740 int no_anc_exists = 1;
741 int i;
743 for (i = 1; i < o->head_idx; i++) {
744 if (!stages[i] || stages[i] == o->df_conflict_entry)
745 any_anc_missing = 1;
746 else
747 no_anc_exists = 0;
750 index = stages[0];
751 head = stages[o->head_idx];
753 if (head == o->df_conflict_entry) {
754 df_conflict_head = 1;
755 head = NULL;
758 if (remote == o->df_conflict_entry) {
759 df_conflict_remote = 1;
760 remote = NULL;
763 /* First, if there's a #16 situation, note that to prevent #13
764 * and #14.
766 if (!same(remote, head)) {
767 for (i = 1; i < o->head_idx; i++) {
768 if (same(stages[i], head)) {
769 head_match = i;
771 if (same(stages[i], remote)) {
772 remote_match = i;
777 /* We start with cases where the index is allowed to match
778 * something other than the head: #14(ALT) and #2ALT, where it
779 * is permitted to match the result instead.
781 /* #14, #14ALT, #2ALT */
782 if (remote && !df_conflict_head && head_match && !remote_match) {
783 if (index && !same(index, remote) && !same(index, head))
784 return o->gently ? -1 : reject_merge(index, o);
785 return merged_entry(remote, index, o);
788 * If we have an entry in the index cache, then we want to
789 * make sure that it matches head.
791 if (index && !same(index, head))
792 return o->gently ? -1 : reject_merge(index, o);
794 if (head) {
795 /* #5ALT, #15 */
796 if (same(head, remote))
797 return merged_entry(head, index, o);
798 /* #13, #3ALT */
799 if (!df_conflict_remote && remote_match && !head_match)
800 return merged_entry(head, index, o);
803 /* #1 */
804 if (!head && !remote && any_anc_missing)
805 return 0;
807 /* Under the new "aggressive" rule, we resolve mostly trivial
808 * cases that we historically had git-merge-one-file resolve.
810 if (o->aggressive) {
811 int head_deleted = !head && !df_conflict_head;
812 int remote_deleted = !remote && !df_conflict_remote;
813 struct cache_entry *ce = NULL;
815 if (index)
816 ce = index;
817 else if (head)
818 ce = head;
819 else if (remote)
820 ce = remote;
821 else {
822 for (i = 1; i < o->head_idx; i++) {
823 if (stages[i] && stages[i] != o->df_conflict_entry) {
824 ce = stages[i];
825 break;
831 * Deleted in both.
832 * Deleted in one and unchanged in the other.
834 if ((head_deleted && remote_deleted) ||
835 (head_deleted && remote && remote_match) ||
836 (remote_deleted && head && head_match)) {
837 if (index)
838 return deleted_entry(index, index, o);
839 if (ce && !head_deleted) {
840 if (verify_absent(ce, "removed", o))
841 return -1;
843 return 0;
846 * Added in both, identically.
848 if (no_anc_exists && head && remote && same(head, remote))
849 return merged_entry(head, index, o);
853 /* Below are "no merge" cases, which require that the index be
854 * up-to-date to avoid the files getting overwritten with
855 * conflict resolution files.
857 if (index) {
858 if (verify_uptodate(index, o))
859 return -1;
862 o->nontrivial_merge = 1;
864 /* #2, #3, #4, #6, #7, #9, #10, #11. */
865 count = 0;
866 if (!head_match || !remote_match) {
867 for (i = 1; i < o->head_idx; i++) {
868 if (stages[i] && stages[i] != o->df_conflict_entry) {
869 keep_entry(stages[i], o);
870 count++;
871 break;
875 #if DBRT_DEBUG
876 else {
877 fprintf(stderr, "read-tree: warning #16 detected\n");
878 show_stage_entry(stderr, "head ", stages[head_match]);
879 show_stage_entry(stderr, "remote ", stages[remote_match]);
881 #endif
882 if (head) { count += keep_entry(head, o); }
883 if (remote) { count += keep_entry(remote, o); }
884 return count;
888 * Two-way merge.
890 * The rule is to "carry forward" what is in the index without losing
891 * information across a "fast forward", favoring a successful merge
892 * over a merge failure when it makes sense. For details of the
893 * "carry forward" rule, please see <Documentation/git-read-tree.txt>.
896 int twoway_merge(struct cache_entry **src, struct unpack_trees_options *o)
898 struct cache_entry *current = src[0];
899 struct cache_entry *oldtree = src[1];
900 struct cache_entry *newtree = src[2];
902 if (o->merge_size != 2)
903 return error("Cannot do a twoway merge of %d trees",
904 o->merge_size);
906 if (oldtree == o->df_conflict_entry)
907 oldtree = NULL;
908 if (newtree == o->df_conflict_entry)
909 newtree = NULL;
911 if (current) {
912 if ((!oldtree && !newtree) || /* 4 and 5 */
913 (!oldtree && newtree &&
914 same(current, newtree)) || /* 6 and 7 */
915 (oldtree && newtree &&
916 same(oldtree, newtree)) || /* 14 and 15 */
917 (oldtree && newtree &&
918 !same(oldtree, newtree) && /* 18 and 19 */
919 same(current, newtree))) {
920 return keep_entry(current, o);
922 else if (oldtree && !newtree && same(current, oldtree)) {
923 /* 10 or 11 */
924 return deleted_entry(oldtree, current, o);
926 else if (oldtree && newtree &&
927 same(current, oldtree) && !same(current, newtree)) {
928 /* 20 or 21 */
929 return merged_entry(newtree, current, o);
931 else {
932 /* all other failures */
933 if (oldtree)
934 return o->gently ? -1 : reject_merge(oldtree, o);
935 if (current)
936 return o->gently ? -1 : reject_merge(current, o);
937 if (newtree)
938 return o->gently ? -1 : reject_merge(newtree, o);
939 return -1;
942 else if (newtree) {
943 if (oldtree && !o->initial_checkout) {
945 * deletion of the path was staged;
947 if (same(oldtree, newtree))
948 return 1;
949 return reject_merge(oldtree, o);
951 return merged_entry(newtree, current, o);
953 return deleted_entry(oldtree, current, o);
957 * Bind merge.
959 * Keep the index entries at stage0, collapse stage1 but make sure
960 * stage0 does not have anything there.
962 int bind_merge(struct cache_entry **src,
963 struct unpack_trees_options *o)
965 struct cache_entry *old = src[0];
966 struct cache_entry *a = src[1];
968 if (o->merge_size != 1)
969 return error("Cannot do a bind merge of %d trees\n",
970 o->merge_size);
971 if (a && old)
972 return o->gently ? -1 :
973 error(ERRORMSG(o, bind_overlap), a->name, old->name);
974 if (!a)
975 return keep_entry(old, o);
976 else
977 return merged_entry(a, NULL, o);
981 * One-way merge.
983 * The rule is:
984 * - take the stat information from stage0, take the data from stage1
986 int oneway_merge(struct cache_entry **src, struct unpack_trees_options *o)
988 struct cache_entry *old = src[0];
989 struct cache_entry *a = src[1];
991 if (o->merge_size != 1)
992 return error("Cannot do a oneway merge of %d trees",
993 o->merge_size);
995 if (!a)
996 return deleted_entry(old, old, o);
998 if (old && same(old, a)) {
999 int update = 0;
1000 if (o->reset) {
1001 struct stat st;
1002 if (lstat(old->name, &st) ||
1003 ie_match_stat(o->src_index, old, &st, CE_MATCH_IGNORE_VALID))
1004 update |= CE_UPDATE;
1006 add_entry(o, old, update, 0);
1007 return 0;
1009 return merged_entry(a, old, o);