1/*
2 * GIT - The information manager from hell
3 *
4 * Copyright (C) Linus Torvalds, 2005
5 */
6#define DBRT_DEBUG 1
7#include "cache.h"
9#include "object.h"
11#include "tree.h"
12#include "cache-tree.h"
13#include <sys/time.h>
14#include <signal.h>
15static int reset = 0;
17static int merge = 0;
18static int update = 0;
19static int index_only = 0;
20static int nontrivial_merge = 0;
21static int trivial_merges_only = 0;
22static int aggressive = 0;
23static int verbose_update = 0;
24static volatile int progress_update = 0;
25static const char *prefix = NULL;
26static int head_idx = -1;
28static int merge_size = 0;
29static struct object_list *trees = NULL;
31static struct cache_entry df_conflict_entry = {
33};
34static struct tree_entry_list df_conflict_list = {
36 .name = NULL,
37 .next = &df_conflict_list
38};
39typedef int (*merge_fn_t)(struct cache_entry **src);
41static int entcmp(char *name1, int dir1, char *name2, int dir2)
43{
44 int len1 = strlen(name1);
45 int len2 = strlen(name2);
46 int len = len1 < len2 ? len1 : len2;
47 int ret = memcmp(name1, name2, len);
48 unsigned char c1, c2;
49 if (ret)
50 return ret;
51 c1 = name1[len];
52 c2 = name2[len];
53 if (!c1 && dir1)
54 c1 = '/';
55 if (!c2 && dir2)
56 c2 = '/';
57 ret = (c1 < c2) ? -1 : (c1 > c2) ? 1 : 0;
58 if (c1 && c2 && !ret)
59 ret = len1 - len2;
60 return ret;
61}
62static int unpack_trees_rec(struct tree_entry_list **posns, int len,
64 const char *base, merge_fn_t fn, int *indpos)
65{
66 int baselen = strlen(base);
67 int src_size = len + 1;
68 do {
69 int i;
70 char *first;
71 int firstdir = 0;
72 int pathlen;
73 unsigned ce_size;
74 struct tree_entry_list **subposns;
75 struct cache_entry **src;
76 int any_files = 0;
77 int any_dirs = 0;
78 char *cache_name;
79 int ce_stage;
80 /* Find the first name in the input. */
82 first = NULL;
84 cache_name = NULL;
85 /* Check the cache */
87 if (merge && *indpos < active_nr) {
88 /* This is a bit tricky: */
89 /* If the index has a subdirectory (with
90 * contents) as the first name, it'll get a
91 * filename like "foo/bar". But that's after
92 * "foo", so the entry in trees will get
93 * handled first, at which point we'll go into
94 * "foo", and deal with "bar" from the index,
95 * because the base will be "foo/". The only
96 * way we can actually have "foo/bar" first of
97 * all the things is if the trees don't
98 * contain "foo" at all, in which case we'll
99 * handle "foo/bar" without going into the
100 * directory, but that's fine (and will return
101 * an error anyway, with the added unknown
102 * file case.
103 */
104 cache_name = active_cache[*indpos]->name;
106 if (strlen(cache_name) > baselen &&
107 !memcmp(cache_name, base, baselen)) {
108 cache_name += baselen;
109 first = cache_name;
110 } else {
111 cache_name = NULL;
112 }
113 }
114#if DBRT_DEBUG > 1
116 if (first)
117 printf("index %s\n", first);
118#endif
119 for (i = 0; i < len; i++) {
120 if (!posns[i] || posns[i] == &df_conflict_list)
121 continue;
122#if DBRT_DEBUG > 1
123 printf("%d %s\n", i + 1, posns[i]->name);
124#endif
125 if (!first || entcmp(first, firstdir,
126 posns[i]->name,
127 posns[i]->directory) > 0) {
128 first = posns[i]->name;
129 firstdir = posns[i]->directory;
130 }
131 }
132 /* No name means we're done */
133 if (!first)
134 return 0;
135 pathlen = strlen(first);
137 ce_size = cache_entry_size(baselen + pathlen);
138 src = xcalloc(src_size, sizeof(struct cache_entry *));
140 subposns = xcalloc(len, sizeof(struct tree_list_entry *));
142 if (cache_name && !strcmp(cache_name, first)) {
144 any_files = 1;
145 src[0] = active_cache[*indpos];
146 remove_cache_entry_at(*indpos);
147 }
148 for (i = 0; i < len; i++) {
150 struct cache_entry *ce;
151 if (!posns[i] ||
153 (posns[i] != &df_conflict_list &&
154 strcmp(first, posns[i]->name))) {
155 continue;
156 }
157 if (posns[i] == &df_conflict_list) {
159 src[i + merge] = &df_conflict_entry;
160 continue;
161 }
162 if (posns[i]->directory) {
164 any_dirs = 1;
165 parse_tree(posns[i]->item.tree);
166 subposns[i] = posns[i]->item.tree->entries;
167 posns[i] = posns[i]->next;
168 src[i + merge] = &df_conflict_entry;
169 continue;
170 }
171 if (!merge)
173 ce_stage = 0;
174 else if (i + 1 < head_idx)
175 ce_stage = 1;
176 else if (i + 1 > head_idx)
177 ce_stage = 3;
178 else
179 ce_stage = 2;
180 ce = xcalloc(1, ce_size);
182 ce->ce_mode = create_ce_mode(posns[i]->mode);
183 ce->ce_flags = create_ce_flags(baselen + pathlen,
184 ce_stage);
185 memcpy(ce->name, base, baselen);
186 memcpy(ce->name + baselen, first, pathlen + 1);
187 any_files = 1;
189 memcpy(ce->sha1, posns[i]->item.any->sha1, 20);
191 src[i + merge] = ce;
192 subposns[i] = &df_conflict_list;
193 posns[i] = posns[i]->next;
194 }
195 if (any_files) {
196 if (merge) {
197 int ret;
198#if DBRT_DEBUG > 1
200 printf("%s:\n", first);
201 for (i = 0; i < src_size; i++) {
202 printf(" %d ", i);
203 if (src[i])
204 printf("%s\n", sha1_to_hex(src[i]->sha1));
205 else
206 printf("\n");
207 }
208#endif
209 ret = fn(src);
210
211#if DBRT_DEBUG > 1
212 printf("Added %d entries\n", ret);
213#endif
214 *indpos += ret;
215 } else {
216 for (i = 0; i < src_size; i++) {
217 if (src[i]) {
218 add_cache_entry(src[i], ADD_CACHE_OK_TO_ADD|ADD_CACHE_SKIP_DFCHECK);
219 }
220 }
221 }
222 }
223 if (any_dirs) {
224 char *newbase = xmalloc(baselen + 2 + pathlen);
225 memcpy(newbase, base, baselen);
226 memcpy(newbase + baselen, first, pathlen);
227 newbase[baselen + pathlen] = '/';
228 newbase[baselen + pathlen + 1] = '\0';
229 if (unpack_trees_rec(subposns, len, newbase, fn,
230 indpos))
231 return -1;
232 free(newbase);
233 }
234 free(subposns);
235 free(src);
236 } while (1);
237}
238static void reject_merge(struct cache_entry *ce)
240{
241 die("Entry '%s' would be overwritten by merge. Cannot merge.",
242 ce->name);
243}
244/* Unlink the last component and attempt to remove leading
246 * directories, in case this unlink is the removal of the
247 * last entry in the directory -- empty directories are removed.
248 */
249static void unlink_entry(char *name)
250{
251 char *cp, *prev;
252 if (unlink(name))
254 return;
255 prev = NULL;
256 while (1) {
257 int status;
258 cp = strrchr(name, '/');
259 if (prev)
260 *prev = '/';
261 if (!cp)
262 break;
263 *cp = 0;
265 status = rmdir(name);
266 if (status) {
267 *cp = '/';
268 break;
269 }
270 prev = cp;
271 }
272}
273static void progress_interval(int signum)
275{
276 progress_update = 1;
277}
278static void setup_progress_signal(void)
280{
281 struct sigaction sa;
282 struct itimerval v;
283 memset(&sa, 0, sizeof(sa));
285 sa.sa_handler = progress_interval;
286 sigemptyset(&sa.sa_mask);
287 sa.sa_flags = SA_RESTART;
288 sigaction(SIGALRM, &sa, NULL);
289 v.it_interval.tv_sec = 1;
291 v.it_interval.tv_usec = 0;
292 v.it_value = v.it_interval;
293 setitimer(ITIMER_REAL, &v, NULL);
294}
295static void check_updates(struct cache_entry **src, int nr)
297{
298 static struct checkout state = {
299 .base_dir = "",
300 .force = 1,
301 .quiet = 1,
302 .refresh_cache = 1,
303 };
304 unsigned short mask = htons(CE_UPDATE);
305 unsigned last_percent = 200, cnt = 0, total = 0;
306 if (update && verbose_update) {
308 for (total = cnt = 0; cnt < nr; cnt++) {
309 struct cache_entry *ce = src[cnt];
310 if (!ce->ce_mode || ce->ce_flags & mask)
311 total++;
312 }
313 /* Don't bother doing this for very small updates */
315 if (total < 250)
316 total = 0;
317 if (total) {
319 fprintf(stderr, "Checking files out...\n");
320 setup_progress_signal();
321 progress_update = 1;
322 }
323 cnt = 0;
324 }
325 while (nr--) {
327 struct cache_entry *ce = *src++;
328 if (total) {
330 if (!ce->ce_mode || ce->ce_flags & mask) {
331 unsigned percent;
332 cnt++;
333 percent = (cnt * 100) / total;
334 if (percent != last_percent ||
335 progress_update) {
336 fprintf(stderr, "%4u%% (%u/%u) done\r",
337 percent, cnt, total);
338 last_percent = percent;
339 }
340 }
341 }
342 if (!ce->ce_mode) {
343 if (update)
344 unlink_entry(ce->name);
345 continue;
346 }
347 if (ce->ce_flags & mask) {
348 ce->ce_flags &= ~mask;
349 if (update)
350 checkout_entry(ce, &state, NULL);
351 }
352 }
353 if (total) {
354 signal(SIGALRM, SIG_IGN);
355 fputc('\n', stderr);
356 }
357}
358static int unpack_trees(merge_fn_t fn)
360{
361 int indpos = 0;
362 unsigned len = object_list_length(trees);
363 struct tree_entry_list **posns;
364 int i;
365 struct object_list *posn = trees;
366 merge_size = len;
367 if (len) {
369 posns = xmalloc(len * sizeof(struct tree_entry_list *));
370 for (i = 0; i < len; i++) {
371 posns[i] = ((struct tree *) posn->item)->entries;
372 posn = posn->next;
373 }
374 if (unpack_trees_rec(posns, len, prefix ? prefix : "",
375 fn, &indpos))
376 return -1;
377 }
378 if (trivial_merges_only && nontrivial_merge)
380 die("Merge requires file-level merging");
381 check_updates(active_cache, active_nr);
383 return 0;
384}
385static int list_tree(unsigned char *sha1)
387{
388 struct tree *tree = parse_tree_indirect(sha1);
389 if (!tree)
390 return -1;
391 object_list_append(&tree->object, &trees);
392 return 0;
393}
394static int same(struct cache_entry *a, struct cache_entry *b)
396{
397 if (!!a != !!b)
398 return 0;
399 if (!a && !b)
400 return 1;
401 return a->ce_mode == b->ce_mode &&
402 !memcmp(a->sha1, b->sha1, 20);
403}
404/*
407 * When a CE gets turned into an unmerged entry, we
408 * want it to be up-to-date
409 */
410static void verify_uptodate(struct cache_entry *ce)
411{
412 struct stat st;
413 if (index_only || reset)
415 return;
416 if (!lstat(ce->name, &st)) {
418 unsigned changed = ce_match_stat(ce, &st, 1);
419 if (!changed)
420 return;
421 errno = 0;
422 }
423 if (reset) {
424 ce->ce_flags |= htons(CE_UPDATE);
425 return;
426 }
427 if (errno == ENOENT)
428 return;
429 die("Entry '%s' not uptodate. Cannot merge.", ce->name);
430}
431static void invalidate_ce_path(struct cache_entry *ce)
433{
434 if (ce)
435 cache_tree_invalidate_path(active_cache_tree, ce->name);
436}
437/*
439 * We do not want to remove or overwrite a working tree file that
440 * is not tracked.
441 */
442static void verify_absent(const char *path, const char *action)
443{
444 struct stat st;
445 if (index_only || reset || !update)
447 return;
448 if (!lstat(path, &st))
449 die("Untracked working tree file '%s' "
450 "would be %s by merge.", path, action);
451}
452static int merged_entry(struct cache_entry *merge, struct cache_entry *old)
454{
455 merge->ce_flags |= htons(CE_UPDATE);
456 if (old) {
457 /*
458 * See if we can re-use the old CE directly?
459 * That way we get the uptodate stat info.
460 *
461 * This also removes the UPDATE flag on
462 * a match.
463 */
464 if (same(old, merge)) {
465 *merge = *old;
466 } else {
467 verify_uptodate(old);
468 invalidate_ce_path(old);
469 }
470 }
471 else {
472 verify_absent(merge->name, "overwritten");
473 invalidate_ce_path(merge);
474 }
475 merge->ce_flags &= ~htons(CE_STAGEMASK);
477 add_cache_entry(merge, ADD_CACHE_OK_TO_ADD);
478 return 1;
479}
480static int deleted_entry(struct cache_entry *ce, struct cache_entry *old)
482{
483 if (old)
484 verify_uptodate(old);
485 else
486 verify_absent(ce->name, "removed");
487 ce->ce_mode = 0;
488 add_cache_entry(ce, ADD_CACHE_OK_TO_ADD);
489 invalidate_ce_path(ce);
490 return 1;
491}
492static int keep_entry(struct cache_entry *ce)
494{
495 add_cache_entry(ce, ADD_CACHE_OK_TO_ADD);
496 return 1;
497}
498#if DBRT_DEBUG
500static void show_stage_entry(FILE *o,
501 const char *label, const struct cache_entry *ce)
502{
503 if (!ce)
504 fprintf(o, "%s (missing)\n", label);
505 else
506 fprintf(o, "%s%06o %s %d\t%s\n",
507 label,
508 ntohl(ce->ce_mode),
509 sha1_to_hex(ce->sha1),
510 ce_stage(ce),
511 ce->name);
512}
513#endif
514static int threeway_merge(struct cache_entry **stages)
516{
517 struct cache_entry *index;
518 struct cache_entry *head;
519 struct cache_entry *remote = stages[head_idx + 1];
520 int count;
521 int head_match = 0;
522 int remote_match = 0;
523 const char *path = NULL;
524 int df_conflict_head = 0;
526 int df_conflict_remote = 0;
527 int any_anc_missing = 0;
529 int no_anc_exists = 1;
530 int i;
531 for (i = 1; i < head_idx; i++) {
533 if (!stages[i])
534 any_anc_missing = 1;
535 else {
536 if (!path)
537 path = stages[i]->name;
538 no_anc_exists = 0;
539 }
540 }
541 index = stages[0];
543 head = stages[head_idx];
544 if (head == &df_conflict_entry) {
546 df_conflict_head = 1;
547 head = NULL;
548 }
549 if (remote == &df_conflict_entry) {
551 df_conflict_remote = 1;
552 remote = NULL;
553 }
554 if (!path && index)
556 path = index->name;
557 if (!path && head)
558 path = head->name;
559 if (!path && remote)
560 path = remote->name;
561 /* First, if there's a #16 situation, note that to prevent #13
563 * and #14.
564 */
565 if (!same(remote, head)) {
566 for (i = 1; i < head_idx; i++) {
567 if (same(stages[i], head)) {
568 head_match = i;
569 }
570 if (same(stages[i], remote)) {
571 remote_match = i;
572 }
573 }
574 }
575 /* We start with cases where the index is allowed to match
577 * something other than the head: #14(ALT) and #2ALT, where it
578 * is permitted to match the result instead.
579 */
580 /* #14, #14ALT, #2ALT */
581 if (remote && !df_conflict_head && head_match && !remote_match) {
582 if (index && !same(index, remote) && !same(index, head))
583 reject_merge(index);
584 return merged_entry(remote, index);
585 }
586 /*
587 * If we have an entry in the index cache, then we want to
588 * make sure that it matches head.
589 */
590 if (index && !same(index, head)) {
591 reject_merge(index);
592 }
593 if (head) {
595 /* #5ALT, #15 */
596 if (same(head, remote))
597 return merged_entry(head, index);
598 /* #13, #3ALT */
599 if (!df_conflict_remote && remote_match && !head_match)
600 return merged_entry(head, index);
601 }
602 /* #1 */
604 if (!head && !remote && any_anc_missing)
605 return 0;
606 /* Under the new "aggressive" rule, we resolve mostly trivial
608 * cases that we historically had git-merge-one-file resolve.
609 */
610 if (aggressive) {
611 int head_deleted = !head && !df_conflict_head;
612 int remote_deleted = !remote && !df_conflict_remote;
613 /*
614 * Deleted in both.
615 * Deleted in one and unchanged in the other.
616 */
617 if ((head_deleted && remote_deleted) ||
618 (head_deleted && remote && remote_match) ||
619 (remote_deleted && head && head_match)) {
620 if (index)
621 return deleted_entry(index, index);
622 else if (path)
623 verify_absent(path, "removed");
624 return 0;
625 }
626 /*
627 * Added in both, identically.
628 */
629 if (no_anc_exists && head && remote && same(head, remote))
630 return merged_entry(head, index);
631 }
633 /* Below are "no merge" cases, which require that the index be
635 * up-to-date to avoid the files getting overwritten with
636 * conflict resolution files.
637 */
638 if (index) {
639 verify_uptodate(index);
640 }
641 else if (path)
642 verify_absent(path, "overwritten");
643 nontrivial_merge = 1;
645 /* #2, #3, #4, #6, #7, #9, #11. */
647 count = 0;
648 if (!head_match || !remote_match) {
649 for (i = 1; i < head_idx; i++) {
650 if (stages[i]) {
651 keep_entry(stages[i]);
652 count++;
653 break;
654 }
655 }
656 }
657#if DBRT_DEBUG
658 else {
659 fprintf(stderr, "read-tree: warning #16 detected\n");
660 show_stage_entry(stderr, "head ", stages[head_match]);
661 show_stage_entry(stderr, "remote ", stages[remote_match]);
662 }
663#endif
664 if (head) { count += keep_entry(head); }
665 if (remote) { count += keep_entry(remote); }
666 return count;
667}
668/*
670 * Two-way merge.
671 *
672 * The rule is to "carry forward" what is in the index without losing
673 * information across a "fast forward", favoring a successful merge
674 * over a merge failure when it makes sense. For details of the
675 * "carry forward" rule, please see <Documentation/git-read-tree.txt>.
676 *
677 */
678static int twoway_merge(struct cache_entry **src)
679{
680 struct cache_entry *current = src[0];
681 struct cache_entry *oldtree = src[1], *newtree = src[2];
682 if (merge_size != 2)
684 return error("Cannot do a twoway merge of %d trees",
685 merge_size);
686 if (current) {
688 if ((!oldtree && !newtree) || /* 4 and 5 */
689 (!oldtree && newtree &&
690 same(current, newtree)) || /* 6 and 7 */
691 (oldtree && newtree &&
692 same(oldtree, newtree)) || /* 14 and 15 */
693 (oldtree && newtree &&
694 !same(oldtree, newtree) && /* 18 and 19*/
695 same(current, newtree))) {
696 return keep_entry(current);
697 }
698 else if (oldtree && !newtree && same(current, oldtree)) {
699 /* 10 or 11 */
700 return deleted_entry(oldtree, current);
701 }
702 else if (oldtree && newtree &&
703 same(current, oldtree) && !same(current, newtree)) {
704 /* 20 or 21 */
705 return merged_entry(newtree, current);
706 }
707 else {
708 /* all other failures */
709 if (oldtree)
710 reject_merge(oldtree);
711 if (current)
712 reject_merge(current);
713 if (newtree)
714 reject_merge(newtree);
715 return -1;
716 }
717 }
718 else if (newtree)
719 return merged_entry(newtree, current);
720 else
721 return deleted_entry(oldtree, current);
722}
723/*
725 * Bind merge.
726 *
727 * Keep the index entries at stage0, collapse stage1 but make sure
728 * stage0 does not have anything there.
729 */
730static int bind_merge(struct cache_entry **src)
731{
732 struct cache_entry *old = src[0];
733 struct cache_entry *a = src[1];
734 if (merge_size != 1)
736 return error("Cannot do a bind merge of %d trees\n",
737 merge_size);
738 if (a && old)
739 die("Entry '%s' overlaps. Cannot bind.", a->name);
740 if (!a)
741 return keep_entry(old);
742 else
743 return merged_entry(a, NULL);
744}
745/*
747 * One-way merge.
748 *
749 * The rule is:
750 * - take the stat information from stage0, take the data from stage1
751 */
752static int oneway_merge(struct cache_entry **src)
753{
754 struct cache_entry *old = src[0];
755 struct cache_entry *a = src[1];
756 if (merge_size != 1)
758 return error("Cannot do a oneway merge of %d trees",
759 merge_size);
760 if (!a) {
762 invalidate_ce_path(old);
763 return deleted_entry(old, old);
764 }
765 if (old && same(old, a)) {
766 if (reset) {
767 struct stat st;
768 if (lstat(old->name, &st) ||
769 ce_match_stat(old, &st, 1))
770 old->ce_flags |= htons(CE_UPDATE);
771 }
772 return keep_entry(old);
773 }
774 return merged_entry(a, old);
775}
776static int read_cache_unmerged(void)
778{
779 int i, deleted;
780 struct cache_entry **dst;
781 read_cache();
783 dst = active_cache;
784 deleted = 0;
785 for (i = 0; i < active_nr; i++) {
786 struct cache_entry *ce = active_cache[i];
787 if (ce_stage(ce)) {
788 deleted++;
789 invalidate_ce_path(ce);
790 continue;
791 }
792 if (deleted)
793 *dst = ce;
794 dst++;
795 }
796 active_nr -= deleted;
797 return deleted;
798}
799static void prime_cache_tree_rec(struct cache_tree *it, struct tree *tree)
801{
802 struct tree_entry_list *ent;
803 int cnt;
804
805 memcpy(it->sha1, tree->object.sha1, 20);
806 for (cnt = 0, ent = tree->entries; ent; ent = ent->next) {
807 if (!ent->directory)
808 cnt++;
809 else {
810 struct cache_tree_sub *sub;
811 struct tree *subtree = (struct tree *)ent->item.tree;
812 if (!subtree->object.parsed)
813 parse_tree(subtree);
814 sub = cache_tree_sub(it, ent->name);
815 sub->cache_tree = cache_tree();
816 prime_cache_tree_rec(sub->cache_tree, subtree);
817 cnt += sub->cache_tree->entry_count;
818 }
819 }
820 it->entry_count = cnt;
821}
822static void prime_cache_tree(void)
824{
825 struct tree *tree = (struct tree *)trees->item;
826 if (!tree)
827 return;
828 active_cache_tree = cache_tree();
829 prime_cache_tree_rec(active_cache_tree, tree);
830}
832static const char read_tree_usage[] = "git-read-tree (<sha> | [[-m [--aggressive] | --reset | --prefix=<prefix>] [-u | -i]] <sha1> [<sha2> [<sha3>]])";
834static struct cache_file cache_file;
836int main(int argc, char **argv)
838{
839 int i, newfd, stage = 0;
840 unsigned char sha1[20];
841 merge_fn_t fn = NULL;
842 setup_git_directory();
844 git_config(git_default_config);
845 newfd = hold_index_file_for_update(&cache_file, get_index_file());
847 if (newfd < 0)
848 die("unable to create new cachefile");
849 git_config(git_default_config);
851 merge = 0;
853 reset = 0;
854 for (i = 1; i < argc; i++) {
855 const char *arg = argv[i];
856 /* "-u" means "update", meaning that a merge will update
858 * the working tree.
859 */
860 if (!strcmp(arg, "-u")) {
861 update = 1;
862 continue;
863 }
864 if (!strcmp(arg, "-v")) {
866 verbose_update = 1;
867 continue;
868 }
869 /* "-i" means "index only", meaning that a merge will
871 * not even look at the working tree.
872 */
873 if (!strcmp(arg, "-i")) {
874 index_only = 1;
875 continue;
876 }
877 /* "--prefix=<subdirectory>/" means keep the current index
879 * entries and put the entries from the tree under the
880 * given subdirectory.
881 */
882 if (!strncmp(arg, "--prefix=", 9)) {
883 if (stage || merge || prefix)
884 usage(read_tree_usage);
885 prefix = arg + 9;
886 merge = 1;
887 stage = 1;
888 if (read_cache_unmerged())
889 die("you need to resolve your current index first");
890 continue;
891 }
892 /* This differs from "-m" in that we'll silently ignore unmerged entries */
894 if (!strcmp(arg, "--reset")) {
895 if (stage || merge || prefix)
896 usage(read_tree_usage);
897 reset = 1;
898 merge = 1;
899 stage = 1;
900 read_cache_unmerged();
901 continue;
902 }
903 if (!strcmp(arg, "--trivial")) {
905 trivial_merges_only = 1;
906 continue;
907 }
908 if (!strcmp(arg, "--aggressive")) {
910 aggressive = 1;
911 continue;
912 }
913 /* "-m" stands for "merge", meaning we start in stage 1 */
915 if (!strcmp(arg, "-m")) {
916 if (stage || merge || prefix)
917 usage(read_tree_usage);
918 if (read_cache_unmerged())
919 die("you need to resolve your current index first");
920 stage = 1;
921 merge = 1;
922 continue;
923 }
924 /* using -u and -i at the same time makes no sense */
926 if (1 < index_only + update)
927 usage(read_tree_usage);
928 if (get_sha1(arg, sha1))
930 die("Not a valid object name %s", arg);
931 if (list_tree(sha1) < 0)
932 die("failed to unpack tree object %s", arg);
933 stage++;
934 }
935 if ((update||index_only) && !merge)
936 usage(read_tree_usage);
937 if (prefix) {
939 int pfxlen = strlen(prefix);
940 int pos;
941 if (prefix[pfxlen-1] != '/')
942 die("prefix must end with /");
943 if (stage != 2)
944 die("binding merge takes only one tree");
945 pos = cache_name_pos(prefix, pfxlen);
946 if (0 <= pos)
947 die("corrupt index file");
948 pos = -pos-1;
949 if (pos < active_nr &&
950 !strncmp(active_cache[pos]->name, prefix, pfxlen))
951 die("subdirectory '%s' already exists.", prefix);
952 pos = cache_name_pos(prefix, pfxlen-1);
953 if (0 <= pos)
954 die("file '%.*s' already exists.", pfxlen-1, prefix);
955 }
956 if (merge) {
958 if (stage < 2)
959 die("just how do you expect me to merge %d trees?", stage-1);
960 switch (stage - 1) {
961 case 1:
962 fn = prefix ? bind_merge : oneway_merge;
963 break;
964 case 2:
965 fn = twoway_merge;
966 break;
967 case 3:
968 default:
969 fn = threeway_merge;
970 cache_tree_free(&active_cache_tree);
971 break;
972 }
973 if (stage - 1 >= 3)
975 head_idx = stage - 2;
976 else
977 head_idx = 1;
978 }
979 unpack_trees(fn);
981 /*
983 * When reading only one tree (either the most basic form,
984 * "-m ent" or "--reset ent" form), we can obtain a fully
985 * valid cache-tree because the index must match exactly
986 * what came from the tree.
987 */
988 if (trees && trees->item && (!merge || (stage == 2))) {
989 cache_tree_free(&active_cache_tree);
990 prime_cache_tree();
991 }
992 if (write_cache(newfd, active_cache, active_nr) ||
994 commit_index_file(&cache_file))
995 die("unable to write new index file");
996 return 0;
997}