2 * GIT - The information manager from hell
4 * Copyright (C) Linus Torvalds, 2005
16 static int update = 0;
17 static int index_only = 0;
18 static int nontrivial_merge = 0;
19 static int trivial_merges_only = 0;
20 static int aggressive = 0;
21 static int verbose_update = 0;
22 static volatile int progress_update = 0;
24 static int head_idx = -1;
25 static int merge_size = 0;
27 static struct object_list *trees = NULL;
29 static struct cache_entry df_conflict_entry = {
32 static struct tree_entry_list df_conflict_list = {
34 .next = &df_conflict_list
37 typedef int (*merge_fn_t)(struct cache_entry **src);
39 static int entcmp(char *name1, int dir1, char *name2, int dir2)
41 int len1 = strlen(name1);
42 int len2 = strlen(name2);
43 int len = len1 < len2 ? len1 : len2;
44 int ret = memcmp(name1, name2, len);
54 ret = (c1 < c2) ? -1 : (c1 > c2) ? 1 : 0;
60 static int unpack_trees_rec(struct tree_entry_list **posns, int len,
61 const char *base, merge_fn_t fn, int *indpos)
63 int baselen = strlen(base);
64 int src_size = len + 1;
71 struct tree_entry_list **subposns;
72 struct cache_entry **src;
78 /* Find the first name in the input. */
84 if (merge && *indpos < active_nr) {
85 /* This is a bit tricky: */
86 /* If the index has a subdirectory (with
87 * contents) as the first name, it'll get a
88 * filename like "foo/bar". But that's after
89 * "foo", so the entry in trees will get
90 * handled first, at which point we'll go into
91 * "foo", and deal with "bar" from the index,
92 * because the base will be "foo/". The only
93 * way we can actually have "foo/bar" first of
94 * all the things is if the trees don't
95 * contain "foo" at all, in which case we'll
96 * handle "foo/bar" without going into the
97 * directory, but that's fine (and will return
98 * an error anyway, with the added unknown
102 cache_name = active_cache[*indpos]->name;
103 if (strlen(cache_name) > baselen &&
104 !memcmp(cache_name, base, baselen)) {
105 cache_name += baselen;
114 printf("index %s\n", first);
116 for (i = 0; i < len; i++) {
117 if (!posns[i] || posns[i] == &df_conflict_list)
120 printf("%d %s\n", i + 1, posns[i]->name);
122 if (!first || entcmp(first, firstdir,
124 posns[i]->directory) > 0) {
125 first = posns[i]->name;
126 firstdir = posns[i]->directory;
129 /* No name means we're done */
133 pathlen = strlen(first);
134 ce_size = cache_entry_size(baselen + pathlen);
136 src = xmalloc(sizeof(struct cache_entry *) * src_size);
137 memset(src, 0, sizeof(struct cache_entry *) * src_size);
139 subposns = xmalloc(sizeof(struct tree_list_entry *) * len);
140 memset(subposns, 0, sizeof(struct tree_list_entry *) * len);
142 if (cache_name && !strcmp(cache_name, first)) {
144 src[0] = active_cache[*indpos];
145 remove_cache_entry_at(*indpos);
148 for (i = 0; i < len; i++) {
149 struct cache_entry *ce;
152 (posns[i] != &df_conflict_list &&
153 strcmp(first, posns[i]->name))) {
157 if (posns[i] == &df_conflict_list) {
158 src[i + merge] = &df_conflict_entry;
162 if (posns[i]->directory) {
164 parse_tree(posns[i]->item.tree);
165 subposns[i] = posns[i]->item.tree->entries;
166 posns[i] = posns[i]->next;
167 src[i + merge] = &df_conflict_entry;
173 else if (i + 1 < head_idx)
175 else if (i + 1 > head_idx)
180 ce = xmalloc(ce_size);
181 memset(ce, 0, ce_size);
182 ce->ce_mode = create_ce_mode(posns[i]->mode);
183 ce->ce_flags = create_ce_flags(baselen + pathlen,
185 memcpy(ce->name, base, baselen);
186 memcpy(ce->name + baselen, first, pathlen + 1);
190 memcpy(ce->sha1, posns[i]->item.any->sha1, 20);
192 subposns[i] = &df_conflict_list;
193 posns[i] = posns[i]->next;
200 printf("%s:\n", first);
201 for (i = 0; i < src_size; i++) {
204 printf("%s\n", sha1_to_hex(src[i]->sha1));
212 printf("Added %d entries\n", ret);
216 for (i = 0; i < src_size; i++) {
218 add_cache_entry(src[i], ADD_CACHE_OK_TO_ADD|ADD_CACHE_SKIP_DFCHECK);
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,
239 static void reject_merge(struct cache_entry *ce)
241 die("Entry '%s' would be overwritten by merge. Cannot merge.",
245 /* 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.
249 static void unlink_entry(char *name)
258 cp = strrchr(name, '/');
265 status = rmdir(name);
274 static void progress_interval(int signum)
279 static void setup_progress_signal(void)
284 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);
290 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);
296 static void check_updates(struct cache_entry **src, int nr)
298 static struct checkout state = {
304 unsigned short mask = htons(CE_UPDATE);
305 unsigned last_percent = 200, cnt = 0, total = 0;
307 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)
314 /* Don't bother doing this for very small updates */
319 fprintf(stderr, "Checking files out...\n");
320 setup_progress_signal();
327 struct cache_entry *ce = *src++;
330 if (!ce->ce_mode || ce->ce_flags & mask) {
333 percent = (cnt * 100) / total;
334 if (percent != last_percent ||
336 fprintf(stderr, "%4u%% (%u/%u) done\r",
337 percent, cnt, total);
338 last_percent = percent;
344 unlink_entry(ce->name);
347 if (ce->ce_flags & mask) {
348 ce->ce_flags &= ~mask;
350 checkout_entry(ce, &state, NULL);
354 signal(SIGALRM, SIG_IGN);
359 static int unpack_trees(merge_fn_t fn)
362 unsigned len = object_list_length(trees);
363 struct tree_entry_list **posns;
365 struct object_list *posn = trees;
369 posns = xmalloc(len * sizeof(struct tree_entry_list *));
370 for (i = 0; i < len; i++) {
371 posns[i] = ((struct tree *) posn->item)->entries;
374 if (unpack_trees_rec(posns, len, "", fn, &indpos))
378 if (trivial_merges_only && nontrivial_merge)
379 die("Merge requires file-level merging");
381 check_updates(active_cache, active_nr);
385 static int list_tree(unsigned char *sha1)
387 struct tree *tree = parse_tree_indirect(sha1);
390 object_list_append(&tree->object, &trees);
394 static int same(struct cache_entry *a, struct cache_entry *b)
400 return a->ce_mode == b->ce_mode &&
401 !memcmp(a->sha1, b->sha1, 20);
406 * When a CE gets turned into an unmerged entry, we
407 * want it to be up-to-date
409 static void verify_uptodate(struct cache_entry *ce)
416 if (!lstat(ce->name, &st)) {
417 unsigned changed = ce_match_stat(ce, &st, 1);
424 die("Entry '%s' not uptodate. Cannot merge.", ce->name);
427 static int merged_entry(struct cache_entry *merge, struct cache_entry *old)
429 merge->ce_flags |= htons(CE_UPDATE);
432 * See if we can re-use the old CE directly?
433 * That way we get the uptodate stat info.
435 * This also removes the UPDATE flag on
438 if (same(old, merge)) {
441 verify_uptodate(old);
444 merge->ce_flags &= ~htons(CE_STAGEMASK);
445 add_cache_entry(merge, ADD_CACHE_OK_TO_ADD);
449 static int deleted_entry(struct cache_entry *ce, struct cache_entry *old)
452 verify_uptodate(old);
454 add_cache_entry(ce, ADD_CACHE_OK_TO_ADD);
458 static int keep_entry(struct cache_entry *ce)
460 add_cache_entry(ce, ADD_CACHE_OK_TO_ADD);
465 static void show_stage_entry(FILE *o,
466 const char *label, const struct cache_entry *ce)
469 fprintf(o, "%s (missing)\n", label);
471 fprintf(o, "%s%06o %s %d\t%s\n",
474 sha1_to_hex(ce->sha1),
480 static int threeway_merge(struct cache_entry **stages)
482 struct cache_entry *index;
483 struct cache_entry *head;
484 struct cache_entry *remote = stages[head_idx + 1];
487 int remote_match = 0;
489 int df_conflict_head = 0;
490 int df_conflict_remote = 0;
492 int any_anc_missing = 0;
493 int no_anc_exists = 1;
496 for (i = 1; i < head_idx; i++) {
504 head = stages[head_idx];
506 if (head == &df_conflict_entry) {
507 df_conflict_head = 1;
511 if (remote == &df_conflict_entry) {
512 df_conflict_remote = 1;
516 /* First, if there's a #16 situation, note that to prevent #13
519 if (!same(remote, head)) {
520 for (i = 1; i < head_idx; i++) {
521 if (same(stages[i], head)) {
524 if (same(stages[i], remote)) {
530 /* We start with cases where the index is allowed to match
531 * something other than the head: #14(ALT) and #2ALT, where it
532 * is permitted to match the result instead.
534 /* #14, #14ALT, #2ALT */
535 if (remote && !df_conflict_head && head_match && !remote_match) {
536 if (index && !same(index, remote) && !same(index, head))
538 return merged_entry(remote, index);
541 * If we have an entry in the index cache, then we want to
542 * make sure that it matches head.
544 if (index && !same(index, head)) {
550 if (same(head, remote))
551 return merged_entry(head, index);
553 if (!df_conflict_remote && remote_match && !head_match)
554 return merged_entry(head, index);
558 if (!head && !remote && any_anc_missing)
561 /* Under the new "aggressive" rule, we resolve mostly trivial
562 * cases that we historically had git-merge-one-file resolve.
565 int head_deleted = !head && !df_conflict_head;
566 int remote_deleted = !remote && !df_conflict_remote;
569 * Deleted in one and unchanged in the other.
571 if ((head_deleted && remote_deleted) ||
572 (head_deleted && remote && remote_match) ||
573 (remote_deleted && head && head_match)) {
575 return deleted_entry(index, index);
579 * Added in both, identically.
581 if (no_anc_exists && head && remote && same(head, remote))
582 return merged_entry(head, index);
586 /* Below are "no merge" cases, which require that the index be
587 * up-to-date to avoid the files getting overwritten with
588 * conflict resolution files.
591 verify_uptodate(index);
594 nontrivial_merge = 1;
596 /* #2, #3, #4, #6, #7, #9, #11. */
598 if (!head_match || !remote_match) {
599 for (i = 1; i < head_idx; i++) {
601 keep_entry(stages[i]);
609 fprintf(stderr, "read-tree: warning #16 detected\n");
610 show_stage_entry(stderr, "head ", stages[head_match]);
611 show_stage_entry(stderr, "remote ", stages[remote_match]);
614 if (head) { count += keep_entry(head); }
615 if (remote) { count += keep_entry(remote); }
622 * The rule is to "carry forward" what is in the index without losing
623 * information across a "fast forward", favoring a successful merge
624 * over a merge failure when it makes sense. For details of the
625 * "carry forward" rule, please see <Documentation/git-read-tree.txt>.
628 static int twoway_merge(struct cache_entry **src)
630 struct cache_entry *current = src[0];
631 struct cache_entry *oldtree = src[1], *newtree = src[2];
634 return error("Cannot do a twoway merge of %d trees",
638 if ((!oldtree && !newtree) || /* 4 and 5 */
639 (!oldtree && newtree &&
640 same(current, newtree)) || /* 6 and 7 */
641 (oldtree && newtree &&
642 same(oldtree, newtree)) || /* 14 and 15 */
643 (oldtree && newtree &&
644 !same(oldtree, newtree) && /* 18 and 19*/
645 same(current, newtree))) {
646 return keep_entry(current);
648 else if (oldtree && !newtree && same(current, oldtree)) {
650 return deleted_entry(oldtree, current);
652 else if (oldtree && newtree &&
653 same(current, oldtree) && !same(current, newtree)) {
655 return merged_entry(newtree, current);
658 /* all other failures */
660 reject_merge(oldtree);
662 reject_merge(current);
664 reject_merge(newtree);
669 return merged_entry(newtree, current);
671 return deleted_entry(oldtree, current);
678 * - take the stat information from stage0, take the data from stage1
680 static int oneway_merge(struct cache_entry **src)
682 struct cache_entry *old = src[0];
683 struct cache_entry *a = src[1];
686 return error("Cannot do a oneway merge of %d trees",
691 if (old && same(old, a)) {
692 return keep_entry(old);
694 return merged_entry(a, NULL);
697 static int read_cache_unmerged(void)
700 struct cache_entry **dst;
705 for (i = 0; i < active_nr; i++) {
706 struct cache_entry *ce = active_cache[i];
715 active_nr -= deleted;
719 static const char read_tree_usage[] = "git-read-tree (<sha> | -m [--aggressive] [-u | -i] <sha1> [<sha2> [<sha3>]])";
721 static struct cache_file cache_file;
723 int main(int argc, char **argv)
725 int i, newfd, reset, stage = 0;
726 unsigned char sha1[20];
727 merge_fn_t fn = NULL;
729 setup_git_directory();
730 git_config(git_default_config);
732 newfd = hold_index_file_for_update(&cache_file, get_index_file());
734 die("unable to create new cachefile");
736 git_config(git_default_config);
740 for (i = 1; i < argc; i++) {
741 const char *arg = argv[i];
743 /* "-u" means "update", meaning that a merge will update
746 if (!strcmp(arg, "-u")) {
751 if (!strcmp(arg, "-v")) {
756 /* "-i" means "index only", meaning that a merge will
757 * not even look at the working tree.
759 if (!strcmp(arg, "-i")) {
764 /* This differs from "-m" in that we'll silently ignore unmerged entries */
765 if (!strcmp(arg, "--reset")) {
767 usage(read_tree_usage);
771 read_cache_unmerged();
775 if (!strcmp(arg, "--trivial")) {
776 trivial_merges_only = 1;
780 if (!strcmp(arg, "--aggressive")) {
785 /* "-m" stands for "merge", meaning we start in stage 1 */
786 if (!strcmp(arg, "-m")) {
788 usage(read_tree_usage);
789 if (read_cache_unmerged())
790 die("you need to resolve your current index first");
796 /* using -u and -i at the same time makes no sense */
797 if (1 < index_only + update)
798 usage(read_tree_usage);
800 if (get_sha1(arg, sha1) < 0)
801 usage(read_tree_usage);
802 if (list_tree(sha1) < 0)
803 die("failed to unpack tree object %s", arg);
806 if ((update||index_only) && !merge)
807 usage(read_tree_usage);
811 die("just how do you expect me to merge %d trees?", stage-1);
828 head_idx = stage - 2;
834 if (write_cache(newfd, active_cache, active_nr) ||
835 commit_index_file(&cache_file))
836 die("unable to write new index file");