![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
1 /*
2 * Recursive Merge algorithm stolen from git-merge-recursive.py by
3 * Fredrik Kuivinen.
4 * The thieves were Alex Riesen and Johannes Schindelin, in June/July 2006
5 */
6 #include "advice.h"
7 #include "cache.h"
8 #include "cache-tree.h"
9 #include "commit.h"
10 #include "blob.h"
11 #include "builtin.h"
12 #include "tree-walk.h"
13 #include "diff.h"
14 #include "diffcore.h"
15 #include "tag.h"
16 #include "unpack-trees.h"
17 #include "string-list.h"
18 #include "xdiff-interface.h"
19 #include "ll-merge.h"
20 #include "attr.h"
21 #include "merge-recursive.h"
22 #include "dir.h"
24 static struct tree *shift_tree_object(struct tree *one, struct tree *two,
25 const char *subtree_shift)
26 {
27 unsigned char shifted[20];
29 if (!*subtree_shift) {
30 shift_tree(one->object.sha1, two->object.sha1, shifted, 0);
31 } else {
32 shift_tree_by(one->object.sha1, two->object.sha1, shifted,
33 subtree_shift);
34 }
35 if (!hashcmp(two->object.sha1, shifted))
36 return two;
37 return lookup_tree(shifted);
38 }
40 /*
41 * A virtual commit has (const char *)commit->util set to the name.
42 */
44 static struct commit *make_virtual_commit(struct tree *tree, const char *comment)
45 {
46 struct commit *commit = xcalloc(1, sizeof(struct commit));
47 commit->tree = tree;
48 commit->util = (void*)comment;
49 /* avoid warnings */
50 commit->object.parsed = 1;
51 return commit;
52 }
54 /*
55 * Since we use get_tree_entry(), which does not put the read object into
56 * the object pool, we cannot rely on a == b.
57 */
58 static int sha_eq(const unsigned char *a, const unsigned char *b)
59 {
60 if (!a && !b)
61 return 2;
62 return a && b && hashcmp(a, b) == 0;
63 }
65 /*
66 * Since we want to write the index eventually, we cannot reuse the index
67 * for these (temporary) data.
68 */
69 struct stage_data
70 {
71 struct
72 {
73 unsigned mode;
74 unsigned char sha[20];
75 } stages[4];
76 unsigned processed:1;
77 };
79 static int show(struct merge_options *o, int v)
80 {
81 return (!o->call_depth && o->verbosity >= v) || o->verbosity >= 5;
82 }
84 static void flush_output(struct merge_options *o)
85 {
86 if (o->obuf.len) {
87 fputs(o->obuf.buf, stdout);
88 strbuf_reset(&o->obuf);
89 }
90 }
92 __attribute__((format (printf, 3, 4)))
93 static void output(struct merge_options *o, int v, const char *fmt, ...)
94 {
95 int len;
96 va_list ap;
98 if (!show(o, v))
99 return;
101 strbuf_grow(&o->obuf, o->call_depth * 2 + 2);
102 memset(o->obuf.buf + o->obuf.len, ' ', o->call_depth * 2);
103 strbuf_setlen(&o->obuf, o->obuf.len + o->call_depth * 2);
105 va_start(ap, fmt);
106 len = vsnprintf(o->obuf.buf + o->obuf.len, strbuf_avail(&o->obuf), fmt, ap);
107 va_end(ap);
109 if (len < 0)
110 len = 0;
111 if (len >= strbuf_avail(&o->obuf)) {
112 strbuf_grow(&o->obuf, len + 2);
113 va_start(ap, fmt);
114 len = vsnprintf(o->obuf.buf + o->obuf.len, strbuf_avail(&o->obuf), fmt, ap);
115 va_end(ap);
116 if (len >= strbuf_avail(&o->obuf)) {
117 die("this should not happen, your snprintf is broken");
118 }
119 }
120 strbuf_setlen(&o->obuf, o->obuf.len + len);
121 strbuf_add(&o->obuf, "\n", 1);
122 if (!o->buffer_output)
123 flush_output(o);
124 }
126 static void output_commit_title(struct merge_options *o, struct commit *commit)
127 {
128 int i;
129 flush_output(o);
130 for (i = o->call_depth; i--;)
131 fputs(" ", stdout);
132 if (commit->util)
133 printf("virtual %s\n", (char *)commit->util);
134 else {
135 printf("%s ", find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV));
136 if (parse_commit(commit) != 0)
137 printf("(bad commit)\n");
138 else {
139 const char *s;
140 int len;
141 for (s = commit->buffer; *s; s++)
142 if (*s == '\n' && s[1] == '\n') {
143 s += 2;
144 break;
145 }
146 for (len = 0; s[len] && '\n' != s[len]; len++)
147 ; /* do nothing */
148 printf("%.*s\n", len, s);
149 }
150 }
151 }
153 static int add_cacheinfo(unsigned int mode, const unsigned char *sha1,
154 const char *path, int stage, int refresh, int options)
155 {
156 struct cache_entry *ce;
157 ce = make_cache_entry(mode, sha1 ? sha1 : null_sha1, path, stage, refresh);
158 if (!ce)
159 return error("addinfo_cache failed for path '%s'", path);
160 return add_cache_entry(ce, options);
161 }
163 static void init_tree_desc_from_tree(struct tree_desc *desc, struct tree *tree)
164 {
165 parse_tree(tree);
166 init_tree_desc(desc, tree->buffer, tree->size);
167 }
169 static int git_merge_trees(int index_only,
170 struct tree *common,
171 struct tree *head,
172 struct tree *merge)
173 {
174 int rc;
175 struct tree_desc t[3];
176 struct unpack_trees_options opts;
178 memset(&opts, 0, sizeof(opts));
179 if (index_only)
180 opts.index_only = 1;
181 else
182 opts.update = 1;
183 opts.merge = 1;
184 opts.head_idx = 2;
185 opts.fn = threeway_merge;
186 opts.src_index = &the_index;
187 opts.dst_index = &the_index;
188 opts.msgs = get_porcelain_error_msgs();
190 init_tree_desc_from_tree(t+0, common);
191 init_tree_desc_from_tree(t+1, head);
192 init_tree_desc_from_tree(t+2, merge);
194 rc = unpack_trees(3, t, &opts);
195 cache_tree_free(&active_cache_tree);
196 return rc;
197 }
199 struct tree *write_tree_from_memory(struct merge_options *o)
200 {
201 struct tree *result = NULL;
203 if (unmerged_cache()) {
204 int i;
205 fprintf(stderr, "BUG: There are unmerged index entries:\n");
206 for (i = 0; i < active_nr; i++) {
207 struct cache_entry *ce = active_cache[i];
208 if (ce_stage(ce))
209 fprintf(stderr, "BUG: %d %.*s", ce_stage(ce),
210 (int)ce_namelen(ce), ce->name);
211 }
212 die("Bug in merge-recursive.c");
213 }
215 if (!active_cache_tree)
216 active_cache_tree = cache_tree();
218 if (!cache_tree_fully_valid(active_cache_tree) &&
219 cache_tree_update(active_cache_tree,
220 active_cache, active_nr, 0, 0) < 0)
221 die("error building trees");
223 result = lookup_tree(active_cache_tree->sha1);
225 return result;
226 }
228 static int save_files_dirs(const unsigned char *sha1,
229 const char *base, int baselen, const char *path,
230 unsigned int mode, int stage, void *context)
231 {
232 int len = strlen(path);
233 char *newpath = xmalloc(baselen + len + 1);
234 struct merge_options *o = context;
236 memcpy(newpath, base, baselen);
237 memcpy(newpath + baselen, path, len);
238 newpath[baselen + len] = '\0';
240 if (S_ISDIR(mode))
241 string_list_insert(newpath, &o->current_directory_set);
242 else
243 string_list_insert(newpath, &o->current_file_set);
244 free(newpath);
246 return (S_ISDIR(mode) ? READ_TREE_RECURSIVE : 0);
247 }
249 static int get_files_dirs(struct merge_options *o, struct tree *tree)
250 {
251 int n;
252 if (read_tree_recursive(tree, "", 0, 0, NULL, save_files_dirs, o))
253 return 0;
254 n = o->current_file_set.nr + o->current_directory_set.nr;
255 return n;
256 }
258 /*
259 * Returns an index_entry instance which doesn't have to correspond to
260 * a real cache entry in Git's index.
261 */
262 static struct stage_data *insert_stage_data(const char *path,
263 struct tree *o, struct tree *a, struct tree *b,
264 struct string_list *entries)
265 {
266 struct string_list_item *item;
267 struct stage_data *e = xcalloc(1, sizeof(struct stage_data));
268 get_tree_entry(o->object.sha1, path,
269 e->stages[1].sha, &e->stages[1].mode);
270 get_tree_entry(a->object.sha1, path,
271 e->stages[2].sha, &e->stages[2].mode);
272 get_tree_entry(b->object.sha1, path,
273 e->stages[3].sha, &e->stages[3].mode);
274 item = string_list_insert(path, entries);
275 item->util = e;
276 return e;
277 }
279 /*
280 * Create a dictionary mapping file names to stage_data objects. The
281 * dictionary contains one entry for every path with a non-zero stage entry.
282 */
283 static struct string_list *get_unmerged(void)
284 {
285 struct string_list *unmerged = xcalloc(1, sizeof(struct string_list));
286 int i;
288 unmerged->strdup_strings = 1;
290 for (i = 0; i < active_nr; i++) {
291 struct string_list_item *item;
292 struct stage_data *e;
293 struct cache_entry *ce = active_cache[i];
294 if (!ce_stage(ce))
295 continue;
297 item = string_list_lookup(ce->name, unmerged);
298 if (!item) {
299 item = string_list_insert(ce->name, unmerged);
300 item->util = xcalloc(1, sizeof(struct stage_data));
301 }
302 e = item->util;
303 e->stages[ce_stage(ce)].mode = ce->ce_mode;
304 hashcpy(e->stages[ce_stage(ce)].sha, ce->sha1);
305 }
307 return unmerged;
308 }
310 struct rename
311 {
312 struct diff_filepair *pair;
313 struct stage_data *src_entry;
314 struct stage_data *dst_entry;
315 unsigned processed:1;
316 };
318 /*
319 * Get information of all renames which occurred between 'o_tree' and
320 * 'tree'. We need the three trees in the merge ('o_tree', 'a_tree' and
321 * 'b_tree') to be able to associate the correct cache entries with
322 * the rename information. 'tree' is always equal to either a_tree or b_tree.
323 */
324 static struct string_list *get_renames(struct merge_options *o,
325 struct tree *tree,
326 struct tree *o_tree,
327 struct tree *a_tree,
328 struct tree *b_tree,
329 struct string_list *entries)
330 {
331 int i;
332 struct string_list *renames;
333 struct diff_options opts;
335 renames = xcalloc(1, sizeof(struct string_list));
336 diff_setup(&opts);
337 DIFF_OPT_SET(&opts, RECURSIVE);
338 opts.detect_rename = DIFF_DETECT_RENAME;
339 opts.rename_limit = o->merge_rename_limit >= 0 ? o->merge_rename_limit :
340 o->diff_rename_limit >= 0 ? o->diff_rename_limit :
341 500;
342 opts.warn_on_too_large_rename = 1;
343 opts.output_format = DIFF_FORMAT_NO_OUTPUT;
344 if (diff_setup_done(&opts) < 0)
345 die("diff setup failed");
346 diff_tree_sha1(o_tree->object.sha1, tree->object.sha1, "", &opts);
347 diffcore_std(&opts);
348 for (i = 0; i < diff_queued_diff.nr; ++i) {
349 struct string_list_item *item;
350 struct rename *re;
351 struct diff_filepair *pair = diff_queued_diff.queue[i];
352 if (pair->status != 'R') {
353 diff_free_filepair(pair);
354 continue;
355 }
356 re = xmalloc(sizeof(*re));
357 re->processed = 0;
358 re->pair = pair;
359 item = string_list_lookup(re->pair->one->path, entries);
360 if (!item)
361 re->src_entry = insert_stage_data(re->pair->one->path,
362 o_tree, a_tree, b_tree, entries);
363 else
364 re->src_entry = item->util;
366 item = string_list_lookup(re->pair->two->path, entries);
367 if (!item)
368 re->dst_entry = insert_stage_data(re->pair->two->path,
369 o_tree, a_tree, b_tree, entries);
370 else
371 re->dst_entry = item->util;
372 item = string_list_insert(pair->one->path, renames);
373 item->util = re;
374 }
375 opts.output_format = DIFF_FORMAT_NO_OUTPUT;
376 diff_queued_diff.nr = 0;
377 diff_flush(&opts);
378 return renames;
379 }
381 static int update_stages(const char *path, struct diff_filespec *o,
382 struct diff_filespec *a, struct diff_filespec *b,
383 int clear)
384 {
385 int options = ADD_CACHE_OK_TO_ADD | ADD_CACHE_OK_TO_REPLACE;
386 if (clear)
387 if (remove_file_from_cache(path))
388 return -1;
389 if (o)
390 if (add_cacheinfo(o->mode, o->sha1, path, 1, 0, options))
391 return -1;
392 if (a)
393 if (add_cacheinfo(a->mode, a->sha1, path, 2, 0, options))
394 return -1;
395 if (b)
396 if (add_cacheinfo(b->mode, b->sha1, path, 3, 0, options))
397 return -1;
398 return 0;
399 }
401 static int remove_file(struct merge_options *o, int clean,
402 const char *path, int no_wd)
403 {
404 int update_cache = o->call_depth || clean;
405 int update_working_directory = !o->call_depth && !no_wd;
407 if (update_cache) {
408 if (remove_file_from_cache(path))
409 return -1;
410 }
411 if (update_working_directory) {
412 if (remove_path(path))
413 return -1;
414 }
415 return 0;
416 }
418 static char *unique_path(struct merge_options *o, const char *path, const char *branch)
419 {
420 char *newpath = xmalloc(strlen(path) + 1 + strlen(branch) + 8 + 1);
421 int suffix = 0;
422 struct stat st;
423 char *p = newpath + strlen(path);
424 strcpy(newpath, path);
425 *(p++) = '~';
426 strcpy(p, branch);
427 for (; *p; ++p)
428 if ('/' == *p)
429 *p = '_';
430 while (string_list_has_string(&o->current_file_set, newpath) ||
431 string_list_has_string(&o->current_directory_set, newpath) ||
432 lstat(newpath, &st) == 0)
433 sprintf(p, "_%d", suffix++);
435 string_list_insert(newpath, &o->current_file_set);
436 return newpath;
437 }
439 static void flush_buffer(int fd, const char *buf, unsigned long size)
440 {
441 while (size > 0) {
442 long ret = write_in_full(fd, buf, size);
443 if (ret < 0) {
444 /* Ignore epipe */
445 if (errno == EPIPE)
446 break;
447 die_errno("merge-recursive");
448 } else if (!ret) {
449 die("merge-recursive: disk full?");
450 }
451 size -= ret;
452 buf += ret;
453 }
454 }
456 static int would_lose_untracked(const char *path)
457 {
458 int pos = cache_name_pos(path, strlen(path));
460 if (pos < 0)
461 pos = -1 - pos;
462 while (pos < active_nr &&
463 !strcmp(path, active_cache[pos]->name)) {
464 /*
465 * If stage #0, it is definitely tracked.
466 * If it has stage #2 then it was tracked
467 * before this merge started. All other
468 * cases the path was not tracked.
469 */
470 switch (ce_stage(active_cache[pos])) {
471 case 0:
472 case 2:
473 return 0;
474 }
475 pos++;
476 }
477 return file_exists(path);
478 }
480 static int make_room_for_path(const char *path)
481 {
482 int status;
483 const char *msg = "failed to create path '%s'%s";
485 status = safe_create_leading_directories_const(path);
486 if (status) {
487 if (status == -3) {
488 /* something else exists */
489 error(msg, path, ": perhaps a D/F conflict?");
490 return -1;
491 }
492 die(msg, path, "");
493 }
495 /*
496 * Do not unlink a file in the work tree if we are not
497 * tracking it.
498 */
499 if (would_lose_untracked(path))
500 return error("refusing to lose untracked file at '%s'",
501 path);
503 /* Successful unlink is good.. */
504 if (!unlink(path))
505 return 0;
506 /* .. and so is no existing file */
507 if (errno == ENOENT)
508 return 0;
509 /* .. but not some other error (who really cares what?) */
510 return error(msg, path, ": perhaps a D/F conflict?");
511 }
513 static void update_file_flags(struct merge_options *o,
514 const unsigned char *sha,
515 unsigned mode,
516 const char *path,
517 int update_cache,
518 int update_wd)
519 {
520 if (o->call_depth)
521 update_wd = 0;
523 if (update_wd) {
524 enum object_type type;
525 void *buf;
526 unsigned long size;
528 if (S_ISGITLINK(mode))
529 /*
530 * We may later decide to recursively descend into
531 * the submodule directory and update its index
532 * and/or work tree, but we do not do that now.
533 */
534 goto update_index;
536 buf = read_sha1_file(sha, &type, &size);
537 if (!buf)
538 die("cannot read object %s '%s'", sha1_to_hex(sha), path);
539 if (type != OBJ_BLOB)
540 die("blob expected for %s '%s'", sha1_to_hex(sha), path);
541 if (S_ISREG(mode)) {
542 struct strbuf strbuf = STRBUF_INIT;
543 if (convert_to_working_tree(path, buf, size, &strbuf)) {
544 free(buf);
545 size = strbuf.len;
546 buf = strbuf_detach(&strbuf, NULL);
547 }
548 }
550 if (make_room_for_path(path) < 0) {
551 update_wd = 0;
552 free(buf);
553 goto update_index;
554 }
555 if (S_ISREG(mode) || (!has_symlinks && S_ISLNK(mode))) {
556 int fd;
557 if (mode & 0100)
558 mode = 0777;
559 else
560 mode = 0666;
561 fd = open(path, O_WRONLY | O_TRUNC | O_CREAT, mode);
562 if (fd < 0)
563 die_errno("failed to open '%s'", path);
564 flush_buffer(fd, buf, size);
565 close(fd);
566 } else if (S_ISLNK(mode)) {
567 char *lnk = xmemdupz(buf, size);
568 safe_create_leading_directories_const(path);
569 unlink(path);
570 if (symlink(lnk, path))
571 die_errno("failed to symlink '%s'", path);
572 free(lnk);
573 } else
574 die("do not know what to do with %06o %s '%s'",
575 mode, sha1_to_hex(sha), path);
576 free(buf);
577 }
578 update_index:
579 if (update_cache)
580 add_cacheinfo(mode, sha, path, 0, update_wd, ADD_CACHE_OK_TO_ADD);
581 }
583 static void update_file(struct merge_options *o,
584 int clean,
585 const unsigned char *sha,
586 unsigned mode,
587 const char *path)
588 {
589 update_file_flags(o, sha, mode, path, o->call_depth || clean, !o->call_depth);
590 }
592 /* Low level file merging, update and removal */
594 struct merge_file_info
595 {
596 unsigned char sha[20];
597 unsigned mode;
598 unsigned clean:1,
599 merge:1;
600 };
602 static int merge_3way(struct merge_options *o,
603 mmbuffer_t *result_buf,
604 struct diff_filespec *one,
605 struct diff_filespec *a,
606 struct diff_filespec *b,
607 const char *branch1,
608 const char *branch2)
609 {
610 mmfile_t orig, src1, src2;
611 char *base_name, *name1, *name2;
612 int merge_status;
613 int favor;
615 if (o->call_depth)
616 favor = 0;
617 else {
618 switch (o->recursive_variant) {
619 case MERGE_RECURSIVE_OURS:
620 favor = XDL_MERGE_FAVOR_OURS;
621 break;
622 case MERGE_RECURSIVE_THEIRS:
623 favor = XDL_MERGE_FAVOR_THEIRS;
624 break;
625 default:
626 favor = 0;
627 break;
628 }
629 }
631 if (strcmp(a->path, b->path) ||
632 (o->ancestor != NULL && strcmp(a->path, one->path) != 0)) {
633 base_name = o->ancestor == NULL ? NULL :
634 xstrdup(mkpath("%s:%s", o->ancestor, one->path));
635 name1 = xstrdup(mkpath("%s:%s", branch1, a->path));
636 name2 = xstrdup(mkpath("%s:%s", branch2, b->path));
637 } else {
638 base_name = o->ancestor == NULL ? NULL :
639 xstrdup(mkpath("%s", o->ancestor));
640 name1 = xstrdup(mkpath("%s", branch1));
641 name2 = xstrdup(mkpath("%s", branch2));
642 }
644 read_mmblob(&orig, one->sha1);
645 read_mmblob(&src1, a->sha1);
646 read_mmblob(&src2, b->sha1);
648 merge_status = ll_merge(result_buf, a->path, &orig, base_name,
649 &src1, name1, &src2, name2,
650 ((o->call_depth ? LL_OPT_VIRTUAL_ANCESTOR : 0) |
651 create_ll_flag(favor)));
653 free(name1);
654 free(name2);
655 free(orig.ptr);
656 free(src1.ptr);
657 free(src2.ptr);
658 return merge_status;
659 }
661 static struct merge_file_info merge_file(struct merge_options *o,
662 struct diff_filespec *one,
663 struct diff_filespec *a,
664 struct diff_filespec *b,
665 const char *branch1,
666 const char *branch2)
667 {
668 struct merge_file_info result;
669 result.merge = 0;
670 result.clean = 1;
672 if ((S_IFMT & a->mode) != (S_IFMT & b->mode)) {
673 result.clean = 0;
674 if (S_ISREG(a->mode)) {
675 result.mode = a->mode;
676 hashcpy(result.sha, a->sha1);
677 } else {
678 result.mode = b->mode;
679 hashcpy(result.sha, b->sha1);
680 }
681 } else {
682 if (!sha_eq(a->sha1, one->sha1) && !sha_eq(b->sha1, one->sha1))
683 result.merge = 1;
685 /*
686 * Merge modes
687 */
688 if (a->mode == b->mode || a->mode == one->mode)
689 result.mode = b->mode;
690 else {
691 result.mode = a->mode;
692 if (b->mode != one->mode) {
693 result.clean = 0;
694 result.merge = 1;
695 }
696 }
698 if (sha_eq(a->sha1, b->sha1) || sha_eq(a->sha1, one->sha1))
699 hashcpy(result.sha, b->sha1);
700 else if (sha_eq(b->sha1, one->sha1))
701 hashcpy(result.sha, a->sha1);
702 else if (S_ISREG(a->mode)) {
703 mmbuffer_t result_buf;
704 int merge_status;
706 merge_status = merge_3way(o, &result_buf, one, a, b,
707 branch1, branch2);
709 if ((merge_status < 0) || !result_buf.ptr)
710 die("Failed to execute internal merge");
712 if (write_sha1_file(result_buf.ptr, result_buf.size,
713 blob_type, result.sha))
714 die("Unable to add %s to database",
715 a->path);
717 free(result_buf.ptr);
718 result.clean = (merge_status == 0);
719 } else if (S_ISGITLINK(a->mode)) {
720 result.clean = 0;
721 hashcpy(result.sha, a->sha1);
722 } else if (S_ISLNK(a->mode)) {
723 hashcpy(result.sha, a->sha1);
725 if (!sha_eq(a->sha1, b->sha1))
726 result.clean = 0;
727 } else {
728 die("unsupported object type in the tree");
729 }
730 }
732 return result;
733 }
735 static void conflict_rename_rename(struct merge_options *o,
736 struct rename *ren1,
737 const char *branch1,
738 struct rename *ren2,
739 const char *branch2)
740 {
741 char *del[2];
742 int delp = 0;
743 const char *ren1_dst = ren1->pair->two->path;
744 const char *ren2_dst = ren2->pair->two->path;
745 const char *dst_name1 = ren1_dst;
746 const char *dst_name2 = ren2_dst;
747 if (string_list_has_string(&o->current_directory_set, ren1_dst)) {
748 dst_name1 = del[delp++] = unique_path(o, ren1_dst, branch1);
749 output(o, 1, "%s is a directory in %s adding as %s instead",
750 ren1_dst, branch2, dst_name1);
751 remove_file(o, 0, ren1_dst, 0);
752 }
753 if (string_list_has_string(&o->current_directory_set, ren2_dst)) {
754 dst_name2 = del[delp++] = unique_path(o, ren2_dst, branch2);
755 output(o, 1, "%s is a directory in %s adding as %s instead",
756 ren2_dst, branch1, dst_name2);
757 remove_file(o, 0, ren2_dst, 0);
758 }
759 if (o->call_depth) {
760 remove_file_from_cache(dst_name1);
761 remove_file_from_cache(dst_name2);
762 /*
763 * Uncomment to leave the conflicting names in the resulting tree
764 *
765 * update_file(o, 0, ren1->pair->two->sha1, ren1->pair->two->mode, dst_name1);
766 * update_file(o, 0, ren2->pair->two->sha1, ren2->pair->two->mode, dst_name2);
767 */
768 } else {
769 update_stages(dst_name1, NULL, ren1->pair->two, NULL, 1);
770 update_stages(dst_name2, NULL, NULL, ren2->pair->two, 1);
771 }
772 while (delp--)
773 free(del[delp]);
774 }
776 static void conflict_rename_dir(struct merge_options *o,
777 struct rename *ren1,
778 const char *branch1)
779 {
780 char *new_path = unique_path(o, ren1->pair->two->path, branch1);
781 output(o, 1, "Renaming %s to %s instead", ren1->pair->one->path, new_path);
782 remove_file(o, 0, ren1->pair->two->path, 0);
783 update_file(o, 0, ren1->pair->two->sha1, ren1->pair->two->mode, new_path);
784 free(new_path);
785 }
787 static void conflict_rename_rename_2(struct merge_options *o,
788 struct rename *ren1,
789 const char *branch1,
790 struct rename *ren2,
791 const char *branch2)
792 {
793 char *new_path1 = unique_path(o, ren1->pair->two->path, branch1);
794 char *new_path2 = unique_path(o, ren2->pair->two->path, branch2);
795 output(o, 1, "Renaming %s to %s and %s to %s instead",
796 ren1->pair->one->path, new_path1,
797 ren2->pair->one->path, new_path2);
798 remove_file(o, 0, ren1->pair->two->path, 0);
799 update_file(o, 0, ren1->pair->two->sha1, ren1->pair->two->mode, new_path1);
800 update_file(o, 0, ren2->pair->two->sha1, ren2->pair->two->mode, new_path2);
801 free(new_path2);
802 free(new_path1);
803 }
805 static int process_renames(struct merge_options *o,
806 struct string_list *a_renames,
807 struct string_list *b_renames)
808 {
809 int clean_merge = 1, i, j;
810 struct string_list a_by_dst = {NULL, 0, 0, 0}, b_by_dst = {NULL, 0, 0, 0};
811 const struct rename *sre;
813 for (i = 0; i < a_renames->nr; i++) {
814 sre = a_renames->items[i].util;
815 string_list_insert(sre->pair->two->path, &a_by_dst)->util
816 = sre->dst_entry;
817 }
818 for (i = 0; i < b_renames->nr; i++) {
819 sre = b_renames->items[i].util;
820 string_list_insert(sre->pair->two->path, &b_by_dst)->util
821 = sre->dst_entry;
822 }
824 for (i = 0, j = 0; i < a_renames->nr || j < b_renames->nr;) {
825 char *src;
826 struct string_list *renames1, *renames2Dst;
827 struct rename *ren1 = NULL, *ren2 = NULL;
828 const char *branch1, *branch2;
829 const char *ren1_src, *ren1_dst;
831 if (i >= a_renames->nr) {
832 ren2 = b_renames->items[j++].util;
833 } else if (j >= b_renames->nr) {
834 ren1 = a_renames->items[i++].util;
835 } else {
836 int compare = strcmp(a_renames->items[i].string,
837 b_renames->items[j].string);
838 if (compare <= 0)
839 ren1 = a_renames->items[i++].util;
840 if (compare >= 0)
841 ren2 = b_renames->items[j++].util;
842 }
844 /* TODO: refactor, so that 1/2 are not needed */
845 if (ren1) {
846 renames1 = a_renames;
847 renames2Dst = &b_by_dst;
848 branch1 = o->branch1;
849 branch2 = o->branch2;
850 } else {
851 struct rename *tmp;
852 renames1 = b_renames;
853 renames2Dst = &a_by_dst;
854 branch1 = o->branch2;
855 branch2 = o->branch1;
856 tmp = ren2;
857 ren2 = ren1;
858 ren1 = tmp;
859 }
860 src = ren1->pair->one->path;
862 ren1->dst_entry->processed = 1;
863 ren1->src_entry->processed = 1;
865 if (ren1->processed)
866 continue;
867 ren1->processed = 1;
869 ren1_src = ren1->pair->one->path;
870 ren1_dst = ren1->pair->two->path;
872 if (ren2) {
873 const char *ren2_src = ren2->pair->one->path;
874 const char *ren2_dst = ren2->pair->two->path;
875 /* Renamed in 1 and renamed in 2 */
876 if (strcmp(ren1_src, ren2_src) != 0)
877 die("ren1.src != ren2.src");
878 ren2->dst_entry->processed = 1;
879 ren2->processed = 1;
880 if (strcmp(ren1_dst, ren2_dst) != 0) {
881 clean_merge = 0;
882 output(o, 1, "CONFLICT (rename/rename): "
883 "Rename \"%s\"->\"%s\" in branch \"%s\" "
884 "rename \"%s\"->\"%s\" in \"%s\"%s",
885 src, ren1_dst, branch1,
886 src, ren2_dst, branch2,
887 o->call_depth ? " (left unresolved)": "");
888 if (o->call_depth) {
889 remove_file_from_cache(src);
890 update_file(o, 0, ren1->pair->one->sha1,
891 ren1->pair->one->mode, src);
892 }
893 conflict_rename_rename(o, ren1, branch1, ren2, branch2);
894 } else {
895 struct merge_file_info mfi;
896 remove_file(o, 1, ren1_src, 1);
897 mfi = merge_file(o,
898 ren1->pair->one,
899 ren1->pair->two,
900 ren2->pair->two,
901 branch1,
902 branch2);
903 if (mfi.merge || !mfi.clean)
904 output(o, 1, "Renaming %s->%s", src, ren1_dst);
906 if (mfi.merge)
907 output(o, 2, "Auto-merging %s", ren1_dst);
909 if (!mfi.clean) {
910 output(o, 1, "CONFLICT (content): merge conflict in %s",
911 ren1_dst);
912 clean_merge = 0;
914 if (!o->call_depth)
915 update_stages(ren1_dst,
916 ren1->pair->one,
917 ren1->pair->two,
918 ren2->pair->two,
919 1 /* clear */);
920 }
921 update_file(o, mfi.clean, mfi.sha, mfi.mode, ren1_dst);
922 }
923 } else {
924 /* Renamed in 1, maybe changed in 2 */
925 struct string_list_item *item;
926 /* we only use sha1 and mode of these */
927 struct diff_filespec src_other, dst_other;
928 int try_merge, stage = a_renames == renames1 ? 3: 2;
930 remove_file(o, 1, ren1_src, o->call_depth || stage == 3);
932 hashcpy(src_other.sha1, ren1->src_entry->stages[stage].sha);
933 src_other.mode = ren1->src_entry->stages[stage].mode;
934 hashcpy(dst_other.sha1, ren1->dst_entry->stages[stage].sha);
935 dst_other.mode = ren1->dst_entry->stages[stage].mode;
937 try_merge = 0;
939 if (string_list_has_string(&o->current_directory_set, ren1_dst)) {
940 clean_merge = 0;
941 output(o, 1, "CONFLICT (rename/directory): Rename %s->%s in %s "
942 " directory %s added in %s",
943 ren1_src, ren1_dst, branch1,
944 ren1_dst, branch2);
945 conflict_rename_dir(o, ren1, branch1);
946 } else if (sha_eq(src_other.sha1, null_sha1)) {
947 clean_merge = 0;
948 output(o, 1, "CONFLICT (rename/delete): Rename %s->%s in %s "
949 "and deleted in %s",
950 ren1_src, ren1_dst, branch1,
951 branch2);
952 update_file(o, 0, ren1->pair->two->sha1, ren1->pair->two->mode, ren1_dst);
953 if (!o->call_depth)
954 update_stages(ren1_dst, NULL,
955 branch1 == o->branch1 ?
956 ren1->pair->two : NULL,
957 branch1 == o->branch1 ?
958 NULL : ren1->pair->two, 1);
959 } else if (!sha_eq(dst_other.sha1, null_sha1)) {
960 const char *new_path;
961 clean_merge = 0;
962 try_merge = 1;
963 output(o, 1, "CONFLICT (rename/add): Rename %s->%s in %s. "
964 "%s added in %s",
965 ren1_src, ren1_dst, branch1,
966 ren1_dst, branch2);
967 if (o->call_depth) {
968 struct merge_file_info mfi;
969 struct diff_filespec one, a, b;
971 one.path = a.path = b.path =
972 (char *)ren1_dst;
973 hashcpy(one.sha1, null_sha1);
974 one.mode = 0;
975 hashcpy(a.sha1, ren1->pair->two->sha1);
976 a.mode = ren1->pair->two->mode;
977 hashcpy(b.sha1, dst_other.sha1);
978 b.mode = dst_other.mode;
979 mfi = merge_file(o, &one, &a, &b,
980 branch1,
981 branch2);
982 output(o, 1, "Adding merged %s", ren1_dst);
983 update_file(o, 0,
984 mfi.sha,
985 mfi.mode,
986 ren1_dst);
987 } else {
988 new_path = unique_path(o, ren1_dst, branch2);
989 output(o, 1, "Adding as %s instead", new_path);
990 update_file(o, 0, dst_other.sha1, dst_other.mode, new_path);
991 }
992 } else if ((item = string_list_lookup(ren1_dst, renames2Dst))) {
993 ren2 = item->util;
994 clean_merge = 0;
995 ren2->processed = 1;
996 output(o, 1, "CONFLICT (rename/rename): "
997 "Rename %s->%s in %s. "
998 "Rename %s->%s in %s",
999 ren1_src, ren1_dst, branch1,
1000 ren2->pair->one->path, ren2->pair->two->path, branch2);
1001 conflict_rename_rename_2(o, ren1, branch1, ren2, branch2);
1002 } else
1003 try_merge = 1;
1005 if (try_merge) {
1006 struct diff_filespec *one, *a, *b;
1007 struct merge_file_info mfi;
1008 src_other.path = (char *)ren1_src;
1010 one = ren1->pair->one;
1011 if (a_renames == renames1) {
1012 a = ren1->pair->two;
1013 b = &src_other;
1014 } else {
1015 b = ren1->pair->two;
1016 a = &src_other;
1017 }
1018 mfi = merge_file(o, one, a, b,
1019 o->branch1, o->branch2);
1021 if (mfi.clean &&
1022 sha_eq(mfi.sha, ren1->pair->two->sha1) &&
1023 mfi.mode == ren1->pair->two->mode)
1024 /*
1025 * This messaged is part of
1026 * t6022 test. If you change
1027 * it update the test too.
1028 */
1029 output(o, 3, "Skipped %s (merged same as existing)", ren1_dst);
1030 else {
1031 if (mfi.merge || !mfi.clean)
1032 output(o, 1, "Renaming %s => %s", ren1_src, ren1_dst);
1033 if (mfi.merge)
1034 output(o, 2, "Auto-merging %s", ren1_dst);
1035 if (!mfi.clean) {
1036 output(o, 1, "CONFLICT (rename/modify): Merge conflict in %s",
1037 ren1_dst);
1038 clean_merge = 0;
1040 if (!o->call_depth)
1041 update_stages(ren1_dst,
1042 one, a, b, 1);
1043 }
1044 update_file(o, mfi.clean, mfi.sha, mfi.mode, ren1_dst);
1045 }
1046 }
1047 }
1048 }
1049 string_list_clear(&a_by_dst, 0);
1050 string_list_clear(&b_by_dst, 0);
1052 return clean_merge;
1053 }
1055 static unsigned char *stage_sha(const unsigned char *sha, unsigned mode)
1056 {
1057 return (is_null_sha1(sha) || mode == 0) ? NULL: (unsigned char *)sha;
1058 }
1060 static int read_sha1_strbuf(const unsigned char *sha1, struct strbuf *dst)
1061 {
1062 void *buf;
1063 enum object_type type;
1064 unsigned long size;
1065 buf = read_sha1_file(sha1, &type, &size);
1066 if (!buf)
1067 return error("cannot read object %s", sha1_to_hex(sha1));
1068 if (type != OBJ_BLOB) {
1069 free(buf);
1070 return error("object %s is not a blob", sha1_to_hex(sha1));
1071 }
1072 strbuf_attach(dst, buf, size, size + 1);
1073 return 0;
1074 }
1076 static int blob_unchanged(const unsigned char *o_sha,
1077 const unsigned char *a_sha,
1078 int renormalize, const char *path)
1079 {
1080 struct strbuf o = STRBUF_INIT;
1081 struct strbuf a = STRBUF_INIT;
1082 int ret = 0; /* assume changed for safety */
1084 if (sha_eq(o_sha, a_sha))
1085 return 1;
1086 if (!renormalize)
1087 return 0;
1089 assert(o_sha && a_sha);
1090 if (read_sha1_strbuf(o_sha, &o) || read_sha1_strbuf(a_sha, &a))
1091 goto error_return;
1092 /*
1093 * Note: binary | is used so that both renormalizations are
1094 * performed. Comparison can be skipped if both files are
1095 * unchanged since their sha1s have already been compared.
1096 */
1097 if (renormalize_buffer(path, o.buf, o.len, &o) |
1098 renormalize_buffer(path, a.buf, o.len, &a))
1099 ret = (o.len == a.len && !memcmp(o.buf, a.buf, o.len));
1101 error_return:
1102 strbuf_release(&o);
1103 strbuf_release(&a);
1104 return ret;
1105 }
1107 /* Per entry merge function */
1108 static int process_entry(struct merge_options *o,
1109 const char *path, struct stage_data *entry)
1110 {
1111 /*
1112 printf("processing entry, clean cache: %s\n", index_only ? "yes": "no");
1113 print_index_entry("\tpath: ", entry);
1114 */
1115 int clean_merge = 1;
1116 int normalize = o->renormalize;
1117 unsigned o_mode = entry->stages[1].mode;
1118 unsigned a_mode = entry->stages[2].mode;
1119 unsigned b_mode = entry->stages[3].mode;
1120 unsigned char *o_sha = stage_sha(entry->stages[1].sha, o_mode);
1121 unsigned char *a_sha = stage_sha(entry->stages[2].sha, a_mode);
1122 unsigned char *b_sha = stage_sha(entry->stages[3].sha, b_mode);
1124 if (o_sha && (!a_sha || !b_sha)) {
1125 /* Case A: Deleted in one */
1126 if ((!a_sha && !b_sha) ||
1127 (!b_sha && blob_unchanged(o_sha, a_sha, normalize, path)) ||
1128 (!a_sha && blob_unchanged(o_sha, b_sha, normalize, path))) {
1129 /* Deleted in both or deleted in one and
1130 * unchanged in the other */
1131 if (a_sha)
1132 output(o, 2, "Removing %s", path);
1133 /* do not touch working file if it did not exist */
1134 remove_file(o, 1, path, !a_sha);
1135 } else {
1136 /* Deleted in one and changed in the other */
1137 clean_merge = 0;
1138 if (!a_sha) {
1139 output(o, 1, "CONFLICT (delete/modify): %s deleted in %s "
1140 "and modified in %s. Version %s of %s left in tree.",
1141 path, o->branch1,
1142 o->branch2, o->branch2, path);
1143 update_file(o, 0, b_sha, b_mode, path);
1144 } else {
1145 output(o, 1, "CONFLICT (delete/modify): %s deleted in %s "
1146 "and modified in %s. Version %s of %s left in tree.",
1147 path, o->branch2,
1148 o->branch1, o->branch1, path);
1149 update_file(o, 0, a_sha, a_mode, path);
1150 }
1151 }
1153 } else if ((!o_sha && a_sha && !b_sha) ||
1154 (!o_sha && !a_sha && b_sha)) {
1155 /* Case B: Added in one. */
1156 const char *add_branch;
1157 const char *other_branch;
1158 unsigned mode;
1159 const unsigned char *sha;
1160 const char *conf;
1162 if (a_sha) {
1163 add_branch = o->branch1;
1164 other_branch = o->branch2;
1165 mode = a_mode;
1166 sha = a_sha;
1167 conf = "file/directory";
1168 } else {
1169 add_branch = o->branch2;
1170 other_branch = o->branch1;
1171 mode = b_mode;
1172 sha = b_sha;
1173 conf = "directory/file";
1174 }
1175 if (string_list_has_string(&o->current_directory_set, path)) {
1176 const char *new_path = unique_path(o, path, add_branch);
1177 clean_merge = 0;
1178 output(o, 1, "CONFLICT (%s): There is a directory with name %s in %s. "
1179 "Adding %s as %s",
1180 conf, path, other_branch, path, new_path);
1181 remove_file(o, 0, path, 0);
1182 update_file(o, 0, sha, mode, new_path);
1183 } else {
1184 output(o, 2, "Adding %s", path);
1185 update_file(o, 1, sha, mode, path);
1186 }
1187 } else if (a_sha && b_sha) {
1188 /* Case C: Added in both (check for same permissions) and */
1189 /* case D: Modified in both, but differently. */
1190 const char *reason = "content";
1191 struct merge_file_info mfi;
1192 struct diff_filespec one, a, b;
1194 if (!o_sha) {
1195 reason = "add/add";
1196 o_sha = (unsigned char *)null_sha1;
1197 }
1198 output(o, 2, "Auto-merging %s", path);
1199 one.path = a.path = b.path = (char *)path;
1200 hashcpy(one.sha1, o_sha);
1201 one.mode = o_mode;
1202 hashcpy(a.sha1, a_sha);
1203 a.mode = a_mode;
1204 hashcpy(b.sha1, b_sha);
1205 b.mode = b_mode;
1207 mfi = merge_file(o, &one, &a, &b,
1208 o->branch1, o->branch2);
1210 clean_merge = mfi.clean;
1211 if (!mfi.clean) {
1212 if (S_ISGITLINK(mfi.mode))
1213 reason = "submodule";
1214 output(o, 1, "CONFLICT (%s): Merge conflict in %s",
1215 reason, path);
1216 }
1217 update_file(o, mfi.clean, mfi.sha, mfi.mode, path);
1218 } else if (!o_sha && !a_sha && !b_sha) {
1219 /*
1220 * this entry was deleted altogether. a_mode == 0 means
1221 * we had that path and want to actively remove it.
1222 */
1223 remove_file(o, 1, path, !a_mode);
1224 } else
1225 die("Fatal merge failure, shouldn't happen.");
1227 return clean_merge;
1228 }
1230 struct unpack_trees_error_msgs get_porcelain_error_msgs(void)
1231 {
1232 struct unpack_trees_error_msgs msgs = {
1233 /* would_overwrite */
1234 "Your local changes to '%s' would be overwritten by merge. Aborting.",
1235 /* not_uptodate_file */
1236 "Your local changes to '%s' would be overwritten by merge. Aborting.",
1237 /* not_uptodate_dir */
1238 "Updating '%s' would lose untracked files in it. Aborting.",
1239 /* would_lose_untracked */
1240 "Untracked working tree file '%s' would be %s by merge. Aborting",
1241 /* bind_overlap -- will not happen here */
1242 NULL,
1243 };
1244 if (advice_commit_before_merge) {
1245 msgs.would_overwrite = msgs.not_uptodate_file =
1246 "Your local changes to '%s' would be overwritten by merge. Aborting.\n"
1247 "Please, commit your changes or stash them before you can merge.";
1248 }
1249 return msgs;
1250 }
1252 int merge_trees(struct merge_options *o,
1253 struct tree *head,
1254 struct tree *merge,
1255 struct tree *common,
1256 struct tree **result)
1257 {
1258 int code, clean;
1260 if (o->subtree_shift) {
1261 merge = shift_tree_object(head, merge, o->subtree_shift);
1262 common = shift_tree_object(head, common, o->subtree_shift);
1263 }
1265 if (sha_eq(common->object.sha1, merge->object.sha1)) {
1266 output(o, 0, "Already uptodate!");
1267 *result = head;
1268 return 1;
1269 }
1271 code = git_merge_trees(o->call_depth, common, head, merge);
1273 if (code != 0) {
1274 if (show(o, 4) || o->call_depth)
1275 die("merging of trees %s and %s failed",
1276 sha1_to_hex(head->object.sha1),
1277 sha1_to_hex(merge->object.sha1));
1278 else
1279 exit(128);
1280 }
1282 if (unmerged_cache()) {
1283 struct string_list *entries, *re_head, *re_merge;
1284 int i;
1285 string_list_clear(&o->current_file_set, 1);
1286 string_list_clear(&o->current_directory_set, 1);
1287 get_files_dirs(o, head);
1288 get_files_dirs(o, merge);
1290 entries = get_unmerged();
1291 re_head = get_renames(o, head, common, head, merge, entries);
1292 re_merge = get_renames(o, merge, common, head, merge, entries);
1293 clean = process_renames(o, re_head, re_merge);
1294 for (i = 0; i < entries->nr; i++) {
1295 const char *path = entries->items[i].string;
1296 struct stage_data *e = entries->items[i].util;
1297 if (!e->processed
1298 && !process_entry(o, path, e))
1299 clean = 0;
1300 }
1302 string_list_clear(re_merge, 0);
1303 string_list_clear(re_head, 0);
1304 string_list_clear(entries, 1);
1306 }
1307 else
1308 clean = 1;
1310 if (o->call_depth)
1311 *result = write_tree_from_memory(o);
1313 return clean;
1314 }
1316 static struct commit_list *reverse_commit_list(struct commit_list *list)
1317 {
1318 struct commit_list *next = NULL, *current, *backup;
1319 for (current = list; current; current = backup) {
1320 backup = current->next;
1321 current->next = next;
1322 next = current;
1323 }
1324 return next;
1325 }
1327 /*
1328 * Merge the commits h1 and h2, return the resulting virtual
1329 * commit object and a flag indicating the cleanness of the merge.
1330 */
1331 int merge_recursive(struct merge_options *o,
1332 struct commit *h1,
1333 struct commit *h2,
1334 struct commit_list *ca,
1335 struct commit **result)
1336 {
1337 struct commit_list *iter;
1338 struct commit *merged_common_ancestors;
1339 struct tree *mrtree = mrtree;
1340 int clean;
1342 if (show(o, 4)) {
1343 output(o, 4, "Merging:");
1344 output_commit_title(o, h1);
1345 output_commit_title(o, h2);
1346 }
1348 if (!ca) {
1349 ca = get_merge_bases(h1, h2, 1);
1350 ca = reverse_commit_list(ca);
1351 }
1353 if (show(o, 5)) {
1354 output(o, 5, "found %u common ancestor(s):", commit_list_count(ca));
1355 for (iter = ca; iter; iter = iter->next)
1356 output_commit_title(o, iter->item);
1357 }
1359 merged_common_ancestors = pop_commit(&ca);
1360 if (merged_common_ancestors == NULL) {
1361 /* if there is no common ancestor, make an empty tree */
1362 struct tree *tree = xcalloc(1, sizeof(struct tree));
1364 tree->object.parsed = 1;
1365 tree->object.type = OBJ_TREE;
1366 pretend_sha1_file(NULL, 0, OBJ_TREE, tree->object.sha1);
1367 merged_common_ancestors = make_virtual_commit(tree, "ancestor");
1368 }
1370 for (iter = ca; iter; iter = iter->next) {
1371 const char *saved_b1, *saved_b2;
1372 o->call_depth++;
1373 /*
1374 * When the merge fails, the result contains files
1375 * with conflict markers. The cleanness flag is
1376 * ignored, it was never actually used, as result of
1377 * merge_trees has always overwritten it: the committed
1378 * "conflicts" were already resolved.
1379 */
1380 discard_cache();
1381 saved_b1 = o->branch1;
1382 saved_b2 = o->branch2;
1383 o->branch1 = "Temporary merge branch 1";
1384 o->branch2 = "Temporary merge branch 2";
1385 merge_recursive(o, merged_common_ancestors, iter->item,
1386 NULL, &merged_common_ancestors);
1387 o->branch1 = saved_b1;
1388 o->branch2 = saved_b2;
1389 o->call_depth--;
1391 if (!merged_common_ancestors)
1392 die("merge returned no commit");
1393 }
1395 discard_cache();
1396 if (!o->call_depth)
1397 read_cache();
1399 o->ancestor = "merged common ancestors";
1400 clean = merge_trees(o, h1->tree, h2->tree, merged_common_ancestors->tree,
1401 &mrtree);
1403 if (o->call_depth) {
1404 *result = make_virtual_commit(mrtree, "merged tree");
1405 commit_list_insert(h1, &(*result)->parents);
1406 commit_list_insert(h2, &(*result)->parents->next);
1407 }
1408 flush_output(o);
1409 return clean;
1410 }
1412 static struct commit *get_ref(const unsigned char *sha1, const char *name)
1413 {
1414 struct object *object;
1416 object = deref_tag(parse_object(sha1), name, strlen(name));
1417 if (!object)
1418 return NULL;
1419 if (object->type == OBJ_TREE)
1420 return make_virtual_commit((struct tree*)object, name);
1421 if (object->type != OBJ_COMMIT)
1422 return NULL;
1423 if (parse_commit((struct commit *)object))
1424 return NULL;
1425 return (struct commit *)object;
1426 }
1428 int merge_recursive_generic(struct merge_options *o,
1429 const unsigned char *head,
1430 const unsigned char *merge,
1431 int num_base_list,
1432 const unsigned char **base_list,
1433 struct commit **result)
1434 {
1435 int clean, index_fd;
1436 struct lock_file *lock = xcalloc(1, sizeof(struct lock_file));
1437 struct commit *head_commit = get_ref(head, o->branch1);
1438 struct commit *next_commit = get_ref(merge, o->branch2);
1439 struct commit_list *ca = NULL;
1441 if (base_list) {
1442 int i;
1443 for (i = 0; i < num_base_list; ++i) {
1444 struct commit *base;
1445 if (!(base = get_ref(base_list[i], sha1_to_hex(base_list[i]))))
1446 return error("Could not parse object '%s'",
1447 sha1_to_hex(base_list[i]));
1448 commit_list_insert(base, &ca);
1449 }
1450 }
1452 index_fd = hold_locked_index(lock, 1);
1453 clean = merge_recursive(o, head_commit, next_commit, ca,
1454 result);
1455 if (active_cache_changed &&
1456 (write_cache(index_fd, active_cache, active_nr) ||
1457 commit_locked_index(lock)))
1458 return error("Unable to write index.");
1460 return clean ? 0 : 1;
1461 }
1463 static int merge_recursive_config(const char *var, const char *value, void *cb)
1464 {
1465 struct merge_options *o = cb;
1466 if (!strcasecmp(var, "merge.verbosity")) {
1467 o->verbosity = git_config_int(var, value);
1468 return 0;
1469 }
1470 if (!strcasecmp(var, "diff.renamelimit")) {
1471 o->diff_rename_limit = git_config_int(var, value);
1472 return 0;
1473 }
1474 if (!strcasecmp(var, "merge.renamelimit")) {
1475 o->merge_rename_limit = git_config_int(var, value);
1476 return 0;
1477 }
1478 return git_xmerge_config(var, value, cb);
1479 }
1481 void init_merge_options(struct merge_options *o)
1482 {
1483 memset(o, 0, sizeof(struct merge_options));
1484 o->verbosity = 2;
1485 o->buffer_output = 1;
1486 o->diff_rename_limit = -1;
1487 o->merge_rename_limit = -1;
1488 o->renormalize = merge_renormalize;
1489 git_config(merge_recursive_config, o);
1490 if (getenv("GIT_MERGE_VERBOSITY"))
1491 o->verbosity =
1492 strtol(getenv("GIT_MERGE_VERBOSITY"), NULL, 10);
1493 if (o->verbosity >= 5)
1494 o->buffer_output = 0;
1495 strbuf_init(&o->obuf, 0);
1496 memset(&o->current_file_set, 0, sizeof(struct string_list));
1497 o->current_file_set.strdup_strings = 1;
1498 memset(&o->current_directory_set, 0, sizeof(struct string_list));
1499 o->current_directory_set.strdup_strings = 1;
1500 }