6beb1e49168f09d06523c3b257b47adf74c58251
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 "cache.h"
7#include "advice.h"
8#include "lockfile.h"
9#include "cache-tree.h"
10#include "commit.h"
11#include "blob.h"
12#include "builtin.h"
13#include "tree-walk.h"
14#include "diff.h"
15#include "diffcore.h"
16#include "tag.h"
17#include "unpack-trees.h"
18#include "string-list.h"
19#include "xdiff-interface.h"
20#include "ll-merge.h"
21#include "attr.h"
22#include "merge-recursive.h"
23#include "dir.h"
24#include "submodule.h"
25
26static struct tree *shift_tree_object(struct tree *one, struct tree *two,
27 const char *subtree_shift)
28{
29 struct object_id shifted;
30
31 if (!*subtree_shift) {
32 shift_tree(&one->object.oid, &two->object.oid, &shifted, 0);
33 } else {
34 shift_tree_by(&one->object.oid, &two->object.oid, &shifted,
35 subtree_shift);
36 }
37 if (!oidcmp(&two->object.oid, &shifted))
38 return two;
39 return lookup_tree(shifted.hash);
40}
41
42static struct commit *make_virtual_commit(struct tree *tree, const char *comment)
43{
44 struct commit *commit = alloc_commit_node();
45 struct merge_remote_desc *desc = xmalloc(sizeof(*desc));
46
47 desc->name = comment;
48 desc->obj = (struct object *)commit;
49 commit->tree = tree;
50 commit->util = desc;
51 commit->object.parsed = 1;
52 return commit;
53}
54
55/*
56 * Since we use get_tree_entry(), which does not put the read object into
57 * the object pool, we cannot rely on a == b.
58 */
59static int oid_eq(const struct object_id *a, const struct object_id *b)
60{
61 if (!a && !b)
62 return 2;
63 return a && b && oidcmp(a, b) == 0;
64}
65
66enum rename_type {
67 RENAME_NORMAL = 0,
68 RENAME_DELETE,
69 RENAME_ONE_FILE_TO_ONE,
70 RENAME_ONE_FILE_TO_TWO,
71 RENAME_TWO_FILES_TO_ONE
72};
73
74struct rename_conflict_info {
75 enum rename_type rename_type;
76 struct diff_filepair *pair1;
77 struct diff_filepair *pair2;
78 const char *branch1;
79 const char *branch2;
80 struct stage_data *dst_entry1;
81 struct stage_data *dst_entry2;
82 struct diff_filespec ren1_other;
83 struct diff_filespec ren2_other;
84};
85
86/*
87 * Since we want to write the index eventually, we cannot reuse the index
88 * for these (temporary) data.
89 */
90struct stage_data {
91 struct {
92 unsigned mode;
93 struct object_id oid;
94 } stages[4];
95 struct rename_conflict_info *rename_conflict_info;
96 unsigned processed:1;
97};
98
99static inline void setup_rename_conflict_info(enum rename_type rename_type,
100 struct diff_filepair *pair1,
101 struct diff_filepair *pair2,
102 const char *branch1,
103 const char *branch2,
104 struct stage_data *dst_entry1,
105 struct stage_data *dst_entry2,
106 struct merge_options *o,
107 struct stage_data *src_entry1,
108 struct stage_data *src_entry2)
109{
110 struct rename_conflict_info *ci = xcalloc(1, sizeof(struct rename_conflict_info));
111 ci->rename_type = rename_type;
112 ci->pair1 = pair1;
113 ci->branch1 = branch1;
114 ci->branch2 = branch2;
115
116 ci->dst_entry1 = dst_entry1;
117 dst_entry1->rename_conflict_info = ci;
118 dst_entry1->processed = 0;
119
120 assert(!pair2 == !dst_entry2);
121 if (dst_entry2) {
122 ci->dst_entry2 = dst_entry2;
123 ci->pair2 = pair2;
124 dst_entry2->rename_conflict_info = ci;
125 }
126
127 if (rename_type == RENAME_TWO_FILES_TO_ONE) {
128 /*
129 * For each rename, there could have been
130 * modifications on the side of history where that
131 * file was not renamed.
132 */
133 int ostage1 = o->branch1 == branch1 ? 3 : 2;
134 int ostage2 = ostage1 ^ 1;
135
136 ci->ren1_other.path = pair1->one->path;
137 oidcpy(&ci->ren1_other.oid, &src_entry1->stages[ostage1].oid);
138 ci->ren1_other.mode = src_entry1->stages[ostage1].mode;
139
140 ci->ren2_other.path = pair2->one->path;
141 oidcpy(&ci->ren2_other.oid, &src_entry2->stages[ostage2].oid);
142 ci->ren2_other.mode = src_entry2->stages[ostage2].mode;
143 }
144}
145
146static int show(struct merge_options *o, int v)
147{
148 return (!o->call_depth && o->verbosity >= v) || o->verbosity >= 5;
149}
150
151static void flush_output(struct merge_options *o)
152{
153 if (o->obuf.len) {
154 fputs(o->obuf.buf, stdout);
155 strbuf_reset(&o->obuf);
156 }
157}
158
159__attribute__((format (printf, 3, 4)))
160static void output(struct merge_options *o, int v, const char *fmt, ...)
161{
162 va_list ap;
163
164 if (!show(o, v))
165 return;
166
167 strbuf_addchars(&o->obuf, ' ', o->call_depth * 2);
168
169 va_start(ap, fmt);
170 strbuf_vaddf(&o->obuf, fmt, ap);
171 va_end(ap);
172
173 strbuf_addch(&o->obuf, '\n');
174 if (!o->buffer_output)
175 flush_output(o);
176}
177
178static void output_commit_title(struct merge_options *o, struct commit *commit)
179{
180 int i;
181 flush_output(o);
182 for (i = o->call_depth; i--;)
183 fputs(" ", stdout);
184 if (commit->util)
185 printf("virtual %s\n", merge_remote_util(commit)->name);
186 else {
187 printf("%s ", find_unique_abbrev(commit->object.oid.hash, DEFAULT_ABBREV));
188 if (parse_commit(commit) != 0)
189 printf(_("(bad commit)\n"));
190 else {
191 const char *title;
192 const char *msg = get_commit_buffer(commit, NULL);
193 int len = find_commit_subject(msg, &title);
194 if (len)
195 printf("%.*s\n", len, title);
196 unuse_commit_buffer(commit, msg);
197 }
198 }
199}
200
201static int add_cacheinfo(unsigned int mode, const struct object_id *oid,
202 const char *path, int stage, int refresh, int options)
203{
204 struct cache_entry *ce;
205 int ret;
206
207 ce = make_cache_entry(mode, oid ? oid->hash : null_sha1, path, stage, 0);
208 if (!ce)
209 return error(_("addinfo_cache failed for path '%s'"), path);
210
211 ret = add_cache_entry(ce, options);
212 if (refresh) {
213 struct cache_entry *nce;
214
215 nce = refresh_cache_entry(ce, CE_MATCH_REFRESH | CE_MATCH_IGNORE_MISSING);
216 if (nce != ce)
217 ret = add_cache_entry(nce, options);
218 }
219 return ret;
220}
221
222static void init_tree_desc_from_tree(struct tree_desc *desc, struct tree *tree)
223{
224 parse_tree(tree);
225 init_tree_desc(desc, tree->buffer, tree->size);
226}
227
228static int git_merge_trees(int index_only,
229 struct tree *common,
230 struct tree *head,
231 struct tree *merge)
232{
233 int rc;
234 struct tree_desc t[3];
235 struct unpack_trees_options opts;
236
237 memset(&opts, 0, sizeof(opts));
238 if (index_only)
239 opts.index_only = 1;
240 else
241 opts.update = 1;
242 opts.merge = 1;
243 opts.head_idx = 2;
244 opts.fn = threeway_merge;
245 opts.src_index = &the_index;
246 opts.dst_index = &the_index;
247 setup_unpack_trees_porcelain(&opts, "merge");
248
249 init_tree_desc_from_tree(t+0, common);
250 init_tree_desc_from_tree(t+1, head);
251 init_tree_desc_from_tree(t+2, merge);
252
253 rc = unpack_trees(3, t, &opts);
254 cache_tree_free(&active_cache_tree);
255 return rc;
256}
257
258struct tree *write_tree_from_memory(struct merge_options *o)
259{
260 struct tree *result = NULL;
261
262 if (unmerged_cache()) {
263 int i;
264 fprintf(stderr, "BUG: There are unmerged index entries:\n");
265 for (i = 0; i < active_nr; i++) {
266 const struct cache_entry *ce = active_cache[i];
267 if (ce_stage(ce))
268 fprintf(stderr, "BUG: %d %.*s\n", ce_stage(ce),
269 (int)ce_namelen(ce), ce->name);
270 }
271 die("BUG: unmerged index entries in merge-recursive.c");
272 }
273
274 if (!active_cache_tree)
275 active_cache_tree = cache_tree();
276
277 if (!cache_tree_fully_valid(active_cache_tree) &&
278 cache_tree_update(&the_index, 0) < 0)
279 die(_("error building trees"));
280
281 result = lookup_tree(active_cache_tree->sha1);
282
283 return result;
284}
285
286static int save_files_dirs(const unsigned char *sha1,
287 struct strbuf *base, const char *path,
288 unsigned int mode, int stage, void *context)
289{
290 int baselen = base->len;
291 struct merge_options *o = context;
292
293 strbuf_addstr(base, path);
294
295 if (S_ISDIR(mode))
296 string_list_insert(&o->current_directory_set, base->buf);
297 else
298 string_list_insert(&o->current_file_set, base->buf);
299
300 strbuf_setlen(base, baselen);
301 return (S_ISDIR(mode) ? READ_TREE_RECURSIVE : 0);
302}
303
304static int get_files_dirs(struct merge_options *o, struct tree *tree)
305{
306 int n;
307 struct pathspec match_all;
308 memset(&match_all, 0, sizeof(match_all));
309 if (read_tree_recursive(tree, "", 0, 0, &match_all, save_files_dirs, o))
310 return 0;
311 n = o->current_file_set.nr + o->current_directory_set.nr;
312 return n;
313}
314
315/*
316 * Returns an index_entry instance which doesn't have to correspond to
317 * a real cache entry in Git's index.
318 */
319static struct stage_data *insert_stage_data(const char *path,
320 struct tree *o, struct tree *a, struct tree *b,
321 struct string_list *entries)
322{
323 struct string_list_item *item;
324 struct stage_data *e = xcalloc(1, sizeof(struct stage_data));
325 get_tree_entry(o->object.oid.hash, path,
326 e->stages[1].oid.hash, &e->stages[1].mode);
327 get_tree_entry(a->object.oid.hash, path,
328 e->stages[2].oid.hash, &e->stages[2].mode);
329 get_tree_entry(b->object.oid.hash, path,
330 e->stages[3].oid.hash, &e->stages[3].mode);
331 item = string_list_insert(entries, path);
332 item->util = e;
333 return e;
334}
335
336/*
337 * Create a dictionary mapping file names to stage_data objects. The
338 * dictionary contains one entry for every path with a non-zero stage entry.
339 */
340static struct string_list *get_unmerged(void)
341{
342 struct string_list *unmerged = xcalloc(1, sizeof(struct string_list));
343 int i;
344
345 unmerged->strdup_strings = 1;
346
347 for (i = 0; i < active_nr; i++) {
348 struct string_list_item *item;
349 struct stage_data *e;
350 const struct cache_entry *ce = active_cache[i];
351 if (!ce_stage(ce))
352 continue;
353
354 item = string_list_lookup(unmerged, ce->name);
355 if (!item) {
356 item = string_list_insert(unmerged, ce->name);
357 item->util = xcalloc(1, sizeof(struct stage_data));
358 }
359 e = item->util;
360 e->stages[ce_stage(ce)].mode = ce->ce_mode;
361 hashcpy(e->stages[ce_stage(ce)].oid.hash, ce->sha1);
362 }
363
364 return unmerged;
365}
366
367static int string_list_df_name_compare(const void *a, const void *b)
368{
369 const struct string_list_item *one = a;
370 const struct string_list_item *two = b;
371 int onelen = strlen(one->string);
372 int twolen = strlen(two->string);
373 /*
374 * Here we only care that entries for D/F conflicts are
375 * adjacent, in particular with the file of the D/F conflict
376 * appearing before files below the corresponding directory.
377 * The order of the rest of the list is irrelevant for us.
378 *
379 * To achieve this, we sort with df_name_compare and provide
380 * the mode S_IFDIR so that D/F conflicts will sort correctly.
381 * We use the mode S_IFDIR for everything else for simplicity,
382 * since in other cases any changes in their order due to
383 * sorting cause no problems for us.
384 */
385 int cmp = df_name_compare(one->string, onelen, S_IFDIR,
386 two->string, twolen, S_IFDIR);
387 /*
388 * Now that 'foo' and 'foo/bar' compare equal, we have to make sure
389 * that 'foo' comes before 'foo/bar'.
390 */
391 if (cmp)
392 return cmp;
393 return onelen - twolen;
394}
395
396static void record_df_conflict_files(struct merge_options *o,
397 struct string_list *entries)
398{
399 /* If there is a D/F conflict and the file for such a conflict
400 * currently exist in the working tree, we want to allow it to be
401 * removed to make room for the corresponding directory if needed.
402 * The files underneath the directories of such D/F conflicts will
403 * be processed before the corresponding file involved in the D/F
404 * conflict. If the D/F directory ends up being removed by the
405 * merge, then we won't have to touch the D/F file. If the D/F
406 * directory needs to be written to the working copy, then the D/F
407 * file will simply be removed (in make_room_for_path()) to make
408 * room for the necessary paths. Note that if both the directory
409 * and the file need to be present, then the D/F file will be
410 * reinstated with a new unique name at the time it is processed.
411 */
412 struct string_list df_sorted_entries;
413 const char *last_file = NULL;
414 int last_len = 0;
415 int i;
416
417 /*
418 * If we're merging merge-bases, we don't want to bother with
419 * any working directory changes.
420 */
421 if (o->call_depth)
422 return;
423
424 /* Ensure D/F conflicts are adjacent in the entries list. */
425 memset(&df_sorted_entries, 0, sizeof(struct string_list));
426 for (i = 0; i < entries->nr; i++) {
427 struct string_list_item *next = &entries->items[i];
428 string_list_append(&df_sorted_entries, next->string)->util =
429 next->util;
430 }
431 qsort(df_sorted_entries.items, entries->nr, sizeof(*entries->items),
432 string_list_df_name_compare);
433
434 string_list_clear(&o->df_conflict_file_set, 1);
435 for (i = 0; i < df_sorted_entries.nr; i++) {
436 const char *path = df_sorted_entries.items[i].string;
437 int len = strlen(path);
438 struct stage_data *e = df_sorted_entries.items[i].util;
439
440 /*
441 * Check if last_file & path correspond to a D/F conflict;
442 * i.e. whether path is last_file+'/'+<something>.
443 * If so, record that it's okay to remove last_file to make
444 * room for path and friends if needed.
445 */
446 if (last_file &&
447 len > last_len &&
448 memcmp(path, last_file, last_len) == 0 &&
449 path[last_len] == '/') {
450 string_list_insert(&o->df_conflict_file_set, last_file);
451 }
452
453 /*
454 * Determine whether path could exist as a file in the
455 * working directory as a possible D/F conflict. This
456 * will only occur when it exists in stage 2 as a
457 * file.
458 */
459 if (S_ISREG(e->stages[2].mode) || S_ISLNK(e->stages[2].mode)) {
460 last_file = path;
461 last_len = len;
462 } else {
463 last_file = NULL;
464 }
465 }
466 string_list_clear(&df_sorted_entries, 0);
467}
468
469struct rename {
470 struct diff_filepair *pair;
471 struct stage_data *src_entry;
472 struct stage_data *dst_entry;
473 unsigned processed:1;
474};
475
476/*
477 * Get information of all renames which occurred between 'o_tree' and
478 * 'tree'. We need the three trees in the merge ('o_tree', 'a_tree' and
479 * 'b_tree') to be able to associate the correct cache entries with
480 * the rename information. 'tree' is always equal to either a_tree or b_tree.
481 */
482static struct string_list *get_renames(struct merge_options *o,
483 struct tree *tree,
484 struct tree *o_tree,
485 struct tree *a_tree,
486 struct tree *b_tree,
487 struct string_list *entries)
488{
489 int i;
490 struct string_list *renames;
491 struct diff_options opts;
492
493 renames = xcalloc(1, sizeof(struct string_list));
494 if (!o->detect_rename)
495 return renames;
496
497 diff_setup(&opts);
498 DIFF_OPT_SET(&opts, RECURSIVE);
499 DIFF_OPT_CLR(&opts, RENAME_EMPTY);
500 opts.detect_rename = DIFF_DETECT_RENAME;
501 opts.rename_limit = o->merge_rename_limit >= 0 ? o->merge_rename_limit :
502 o->diff_rename_limit >= 0 ? o->diff_rename_limit :
503 1000;
504 opts.rename_score = o->rename_score;
505 opts.show_rename_progress = o->show_rename_progress;
506 opts.output_format = DIFF_FORMAT_NO_OUTPUT;
507 diff_setup_done(&opts);
508 diff_tree_sha1(o_tree->object.oid.hash, tree->object.oid.hash, "", &opts);
509 diffcore_std(&opts);
510 if (opts.needed_rename_limit > o->needed_rename_limit)
511 o->needed_rename_limit = opts.needed_rename_limit;
512 for (i = 0; i < diff_queued_diff.nr; ++i) {
513 struct string_list_item *item;
514 struct rename *re;
515 struct diff_filepair *pair = diff_queued_diff.queue[i];
516 if (pair->status != 'R') {
517 diff_free_filepair(pair);
518 continue;
519 }
520 re = xmalloc(sizeof(*re));
521 re->processed = 0;
522 re->pair = pair;
523 item = string_list_lookup(entries, re->pair->one->path);
524 if (!item)
525 re->src_entry = insert_stage_data(re->pair->one->path,
526 o_tree, a_tree, b_tree, entries);
527 else
528 re->src_entry = item->util;
529
530 item = string_list_lookup(entries, re->pair->two->path);
531 if (!item)
532 re->dst_entry = insert_stage_data(re->pair->two->path,
533 o_tree, a_tree, b_tree, entries);
534 else
535 re->dst_entry = item->util;
536 item = string_list_insert(renames, pair->one->path);
537 item->util = re;
538 }
539 opts.output_format = DIFF_FORMAT_NO_OUTPUT;
540 diff_queued_diff.nr = 0;
541 diff_flush(&opts);
542 return renames;
543}
544
545static int update_stages(const char *path, const struct diff_filespec *o,
546 const struct diff_filespec *a,
547 const struct diff_filespec *b)
548{
549
550 /*
551 * NOTE: It is usually a bad idea to call update_stages on a path
552 * before calling update_file on that same path, since it can
553 * sometimes lead to spurious "refusing to lose untracked file..."
554 * messages from update_file (via make_room_for path via
555 * would_lose_untracked). Instead, reverse the order of the calls
556 * (executing update_file first and then update_stages).
557 */
558 int clear = 1;
559 int options = ADD_CACHE_OK_TO_ADD | ADD_CACHE_SKIP_DFCHECK;
560 if (clear)
561 if (remove_file_from_cache(path))
562 return -1;
563 if (o)
564 if (add_cacheinfo(o->mode, &o->oid, path, 1, 0, options))
565 return -1;
566 if (a)
567 if (add_cacheinfo(a->mode, &a->oid, path, 2, 0, options))
568 return -1;
569 if (b)
570 if (add_cacheinfo(b->mode, &b->oid, path, 3, 0, options))
571 return -1;
572 return 0;
573}
574
575static void update_entry(struct stage_data *entry,
576 struct diff_filespec *o,
577 struct diff_filespec *a,
578 struct diff_filespec *b)
579{
580 entry->processed = 0;
581 entry->stages[1].mode = o->mode;
582 entry->stages[2].mode = a->mode;
583 entry->stages[3].mode = b->mode;
584 oidcpy(&entry->stages[1].oid, &o->oid);
585 oidcpy(&entry->stages[2].oid, &a->oid);
586 oidcpy(&entry->stages[3].oid, &b->oid);
587}
588
589static int remove_file(struct merge_options *o, int clean,
590 const char *path, int no_wd)
591{
592 int update_cache = o->call_depth || clean;
593 int update_working_directory = !o->call_depth && !no_wd;
594
595 if (update_cache) {
596 if (remove_file_from_cache(path))
597 return -1;
598 }
599 if (update_working_directory) {
600 if (ignore_case) {
601 struct cache_entry *ce;
602 ce = cache_file_exists(path, strlen(path), ignore_case);
603 if (ce && ce_stage(ce) == 0)
604 return 0;
605 }
606 if (remove_path(path))
607 return -1;
608 }
609 return 0;
610}
611
612/* add a string to a strbuf, but converting "/" to "_" */
613static void add_flattened_path(struct strbuf *out, const char *s)
614{
615 size_t i = out->len;
616 strbuf_addstr(out, s);
617 for (; i < out->len; i++)
618 if (out->buf[i] == '/')
619 out->buf[i] = '_';
620}
621
622static char *unique_path(struct merge_options *o, const char *path, const char *branch)
623{
624 struct strbuf newpath = STRBUF_INIT;
625 int suffix = 0;
626 size_t base_len;
627
628 strbuf_addf(&newpath, "%s~", path);
629 add_flattened_path(&newpath, branch);
630
631 base_len = newpath.len;
632 while (string_list_has_string(&o->current_file_set, newpath.buf) ||
633 string_list_has_string(&o->current_directory_set, newpath.buf) ||
634 (!o->call_depth && file_exists(newpath.buf))) {
635 strbuf_setlen(&newpath, base_len);
636 strbuf_addf(&newpath, "_%d", suffix++);
637 }
638
639 string_list_insert(&o->current_file_set, newpath.buf);
640 return strbuf_detach(&newpath, NULL);
641}
642
643static int dir_in_way(const char *path, int check_working_copy)
644{
645 int pos;
646 struct strbuf dirpath = STRBUF_INIT;
647 struct stat st;
648
649 strbuf_addstr(&dirpath, path);
650 strbuf_addch(&dirpath, '/');
651
652 pos = cache_name_pos(dirpath.buf, dirpath.len);
653
654 if (pos < 0)
655 pos = -1 - pos;
656 if (pos < active_nr &&
657 !strncmp(dirpath.buf, active_cache[pos]->name, dirpath.len)) {
658 strbuf_release(&dirpath);
659 return 1;
660 }
661
662 strbuf_release(&dirpath);
663 return check_working_copy && !lstat(path, &st) && S_ISDIR(st.st_mode);
664}
665
666static int was_tracked(const char *path)
667{
668 int pos = cache_name_pos(path, strlen(path));
669
670 if (0 <= pos)
671 /* we have been tracking this path */
672 return 1;
673
674 /*
675 * Look for an unmerged entry for the path,
676 * specifically stage #2, which would indicate
677 * that "our" side before the merge started
678 * had the path tracked (and resulted in a conflict).
679 */
680 for (pos = -1 - pos;
681 pos < active_nr && !strcmp(path, active_cache[pos]->name);
682 pos++)
683 if (ce_stage(active_cache[pos]) == 2)
684 return 1;
685 return 0;
686}
687
688static int would_lose_untracked(const char *path)
689{
690 return !was_tracked(path) && file_exists(path);
691}
692
693static int make_room_for_path(struct merge_options *o, const char *path)
694{
695 int status, i;
696 const char *msg = _("failed to create path '%s'%s");
697
698 /* Unlink any D/F conflict files that are in the way */
699 for (i = 0; i < o->df_conflict_file_set.nr; i++) {
700 const char *df_path = o->df_conflict_file_set.items[i].string;
701 size_t pathlen = strlen(path);
702 size_t df_pathlen = strlen(df_path);
703 if (df_pathlen < pathlen &&
704 path[df_pathlen] == '/' &&
705 strncmp(path, df_path, df_pathlen) == 0) {
706 output(o, 3,
707 _("Removing %s to make room for subdirectory\n"),
708 df_path);
709 unlink(df_path);
710 unsorted_string_list_delete_item(&o->df_conflict_file_set,
711 i, 0);
712 break;
713 }
714 }
715
716 /* Make sure leading directories are created */
717 status = safe_create_leading_directories_const(path);
718 if (status) {
719 if (status == SCLD_EXISTS) {
720 /* something else exists */
721 error(msg, path, _(": perhaps a D/F conflict?"));
722 return -1;
723 }
724 die(msg, path, "");
725 }
726
727 /*
728 * Do not unlink a file in the work tree if we are not
729 * tracking it.
730 */
731 if (would_lose_untracked(path))
732 return error(_("refusing to lose untracked file at '%s'"),
733 path);
734
735 /* Successful unlink is good.. */
736 if (!unlink(path))
737 return 0;
738 /* .. and so is no existing file */
739 if (errno == ENOENT)
740 return 0;
741 /* .. but not some other error (who really cares what?) */
742 return error(msg, path, _(": perhaps a D/F conflict?"));
743}
744
745static int update_file_flags(struct merge_options *o,
746 const struct object_id *oid,
747 unsigned mode,
748 const char *path,
749 int update_cache,
750 int update_wd)
751{
752 if (o->call_depth)
753 update_wd = 0;
754
755 if (update_wd) {
756 enum object_type type;
757 void *buf;
758 unsigned long size;
759
760 if (S_ISGITLINK(mode)) {
761 /*
762 * We may later decide to recursively descend into
763 * the submodule directory and update its index
764 * and/or work tree, but we do not do that now.
765 */
766 update_wd = 0;
767 goto update_index;
768 }
769
770 buf = read_sha1_file(oid->hash, &type, &size);
771 if (!buf)
772 die(_("cannot read object %s '%s'"), oid_to_hex(oid), path);
773 if (type != OBJ_BLOB)
774 die(_("blob expected for %s '%s'"), oid_to_hex(oid), path);
775 if (S_ISREG(mode)) {
776 struct strbuf strbuf = STRBUF_INIT;
777 if (convert_to_working_tree(path, buf, size, &strbuf)) {
778 free(buf);
779 size = strbuf.len;
780 buf = strbuf_detach(&strbuf, NULL);
781 }
782 }
783
784 if (make_room_for_path(o, path) < 0) {
785 update_wd = 0;
786 goto free_buf;
787 }
788 if (S_ISREG(mode) || (!has_symlinks && S_ISLNK(mode))) {
789 int fd;
790 if (mode & 0100)
791 mode = 0777;
792 else
793 mode = 0666;
794 fd = open(path, O_WRONLY | O_TRUNC | O_CREAT, mode);
795 if (fd < 0)
796 die_errno(_("failed to open '%s'"), path);
797 write_in_full(fd, buf, size);
798 close(fd);
799 } else if (S_ISLNK(mode)) {
800 char *lnk = xmemdupz(buf, size);
801 safe_create_leading_directories_const(path);
802 unlink(path);
803 if (symlink(lnk, path))
804 die_errno(_("failed to symlink '%s'"), path);
805 free(lnk);
806 } else
807 die(_("do not know what to do with %06o %s '%s'"),
808 mode, oid_to_hex(oid), path);
809 free_buf:
810 free(buf);
811 }
812 update_index:
813 if (update_cache)
814 add_cacheinfo(mode, oid, path, 0, update_wd, ADD_CACHE_OK_TO_ADD);
815 return 0;
816}
817
818static int update_file(struct merge_options *o,
819 int clean,
820 const struct object_id *oid,
821 unsigned mode,
822 const char *path)
823{
824 return update_file_flags(o, oid, mode, path, o->call_depth || clean, !o->call_depth);
825}
826
827/* Low level file merging, update and removal */
828
829struct merge_file_info {
830 struct object_id oid;
831 unsigned mode;
832 unsigned clean:1,
833 merge:1;
834};
835
836static int merge_3way(struct merge_options *o,
837 mmbuffer_t *result_buf,
838 const struct diff_filespec *one,
839 const struct diff_filespec *a,
840 const struct diff_filespec *b,
841 const char *branch1,
842 const char *branch2)
843{
844 mmfile_t orig, src1, src2;
845 struct ll_merge_options ll_opts = {0};
846 char *base_name, *name1, *name2;
847 int merge_status;
848
849 ll_opts.renormalize = o->renormalize;
850 ll_opts.xdl_opts = o->xdl_opts;
851
852 if (o->call_depth) {
853 ll_opts.virtual_ancestor = 1;
854 ll_opts.variant = 0;
855 } else {
856 switch (o->recursive_variant) {
857 case MERGE_RECURSIVE_OURS:
858 ll_opts.variant = XDL_MERGE_FAVOR_OURS;
859 break;
860 case MERGE_RECURSIVE_THEIRS:
861 ll_opts.variant = XDL_MERGE_FAVOR_THEIRS;
862 break;
863 default:
864 ll_opts.variant = 0;
865 break;
866 }
867 }
868
869 if (strcmp(a->path, b->path) ||
870 (o->ancestor != NULL && strcmp(a->path, one->path) != 0)) {
871 base_name = o->ancestor == NULL ? NULL :
872 mkpathdup("%s:%s", o->ancestor, one->path);
873 name1 = mkpathdup("%s:%s", branch1, a->path);
874 name2 = mkpathdup("%s:%s", branch2, b->path);
875 } else {
876 base_name = o->ancestor == NULL ? NULL :
877 mkpathdup("%s", o->ancestor);
878 name1 = mkpathdup("%s", branch1);
879 name2 = mkpathdup("%s", branch2);
880 }
881
882 read_mmblob(&orig, one->oid.hash);
883 read_mmblob(&src1, a->oid.hash);
884 read_mmblob(&src2, b->oid.hash);
885
886 merge_status = ll_merge(result_buf, a->path, &orig, base_name,
887 &src1, name1, &src2, name2, &ll_opts);
888
889 free(base_name);
890 free(name1);
891 free(name2);
892 free(orig.ptr);
893 free(src1.ptr);
894 free(src2.ptr);
895 return merge_status;
896}
897
898static int merge_file_1(struct merge_options *o,
899 const struct diff_filespec *one,
900 const struct diff_filespec *a,
901 const struct diff_filespec *b,
902 const char *branch1,
903 const char *branch2,
904 struct merge_file_info *result)
905{
906 result->merge = 0;
907 result->clean = 1;
908
909 if ((S_IFMT & a->mode) != (S_IFMT & b->mode)) {
910 result->clean = 0;
911 if (S_ISREG(a->mode)) {
912 result->mode = a->mode;
913 oidcpy(&result->oid, &a->oid);
914 } else {
915 result->mode = b->mode;
916 oidcpy(&result->oid, &b->oid);
917 }
918 } else {
919 if (!oid_eq(&a->oid, &one->oid) && !oid_eq(&b->oid, &one->oid))
920 result->merge = 1;
921
922 /*
923 * Merge modes
924 */
925 if (a->mode == b->mode || a->mode == one->mode)
926 result->mode = b->mode;
927 else {
928 result->mode = a->mode;
929 if (b->mode != one->mode) {
930 result->clean = 0;
931 result->merge = 1;
932 }
933 }
934
935 if (oid_eq(&a->oid, &b->oid) || oid_eq(&a->oid, &one->oid))
936 oidcpy(&result->oid, &b->oid);
937 else if (oid_eq(&b->oid, &one->oid))
938 oidcpy(&result->oid, &a->oid);
939 else if (S_ISREG(a->mode)) {
940 mmbuffer_t result_buf;
941 int merge_status;
942
943 merge_status = merge_3way(o, &result_buf, one, a, b,
944 branch1, branch2);
945
946 if ((merge_status < 0) || !result_buf.ptr)
947 die(_("Failed to execute internal merge"));
948
949 if (write_sha1_file(result_buf.ptr, result_buf.size,
950 blob_type, result->oid.hash))
951 die(_("Unable to add %s to database"),
952 a->path);
953
954 free(result_buf.ptr);
955 result->clean = (merge_status == 0);
956 } else if (S_ISGITLINK(a->mode)) {
957 result->clean = merge_submodule(result->oid.hash,
958 one->path,
959 one->oid.hash,
960 a->oid.hash,
961 b->oid.hash,
962 !o->call_depth);
963 } else if (S_ISLNK(a->mode)) {
964 oidcpy(&result->oid, &a->oid);
965
966 if (!oid_eq(&a->oid, &b->oid))
967 result->clean = 0;
968 } else
969 die("BUG: unsupported object type in the tree");
970 }
971
972 return 0;
973}
974
975static int merge_file_special_markers(struct merge_options *o,
976 const struct diff_filespec *one,
977 const struct diff_filespec *a,
978 const struct diff_filespec *b,
979 const char *branch1,
980 const char *filename1,
981 const char *branch2,
982 const char *filename2,
983 struct merge_file_info *mfi)
984{
985 char *side1 = NULL;
986 char *side2 = NULL;
987 int ret;
988
989 if (filename1)
990 side1 = xstrfmt("%s:%s", branch1, filename1);
991 if (filename2)
992 side2 = xstrfmt("%s:%s", branch2, filename2);
993
994 ret = merge_file_1(o, one, a, b,
995 side1 ? side1 : branch1,
996 side2 ? side2 : branch2, mfi);
997 free(side1);
998 free(side2);
999 return ret;
1000}
1001
1002static int merge_file_one(struct merge_options *o,
1003 const char *path,
1004 const struct object_id *o_oid, int o_mode,
1005 const struct object_id *a_oid, int a_mode,
1006 const struct object_id *b_oid, int b_mode,
1007 const char *branch1,
1008 const char *branch2,
1009 struct merge_file_info *mfi)
1010{
1011 struct diff_filespec one, a, b;
1012
1013 one.path = a.path = b.path = (char *)path;
1014 oidcpy(&one.oid, o_oid);
1015 one.mode = o_mode;
1016 oidcpy(&a.oid, a_oid);
1017 a.mode = a_mode;
1018 oidcpy(&b.oid, b_oid);
1019 b.mode = b_mode;
1020 return merge_file_1(o, &one, &a, &b, branch1, branch2, mfi);
1021}
1022
1023static int handle_change_delete(struct merge_options *o,
1024 const char *path,
1025 const struct object_id *o_oid, int o_mode,
1026 const struct object_id *a_oid, int a_mode,
1027 const struct object_id *b_oid, int b_mode,
1028 const char *change, const char *change_past)
1029{
1030 char *renamed = NULL;
1031 int ret = 0;
1032 if (dir_in_way(path, !o->call_depth)) {
1033 renamed = unique_path(o, path, a_oid ? o->branch1 : o->branch2);
1034 }
1035
1036 if (o->call_depth) {
1037 /*
1038 * We cannot arbitrarily accept either a_sha or b_sha as
1039 * correct; since there is no true "middle point" between
1040 * them, simply reuse the base version for virtual merge base.
1041 */
1042 ret = remove_file_from_cache(path);
1043 if (!ret)
1044 ret = update_file(o, 0, o_oid, o_mode,
1045 renamed ? renamed : path);
1046 } else if (!a_oid) {
1047 if (!renamed) {
1048 output(o, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1049 "and %s in %s. Version %s of %s left in tree."),
1050 change, path, o->branch1, change_past,
1051 o->branch2, o->branch2, path);
1052 ret = update_file(o, 0, b_oid, b_mode, path);
1053 } else {
1054 output(o, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1055 "and %s in %s. Version %s of %s left in tree at %s."),
1056 change, path, o->branch1, change_past,
1057 o->branch2, o->branch2, path, renamed);
1058 ret = update_file(o, 0, b_oid, b_mode, renamed);
1059 }
1060 } else {
1061 if (!renamed) {
1062 output(o, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1063 "and %s in %s. Version %s of %s left in tree."),
1064 change, path, o->branch2, change_past,
1065 o->branch1, o->branch1, path);
1066 } else {
1067 output(o, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1068 "and %s in %s. Version %s of %s left in tree at %s."),
1069 change, path, o->branch2, change_past,
1070 o->branch1, o->branch1, path, renamed);
1071 ret = update_file(o, 0, a_oid, a_mode, renamed);
1072 }
1073 /*
1074 * No need to call update_file() on path when !renamed, since
1075 * that would needlessly touch path. We could call
1076 * update_file_flags() with update_cache=0 and update_wd=0,
1077 * but that's a no-op.
1078 */
1079 }
1080 free(renamed);
1081
1082 return ret;
1083}
1084
1085static int conflict_rename_delete(struct merge_options *o,
1086 struct diff_filepair *pair,
1087 const char *rename_branch,
1088 const char *other_branch)
1089{
1090 const struct diff_filespec *orig = pair->one;
1091 const struct diff_filespec *dest = pair->two;
1092 const struct object_id *a_oid = NULL;
1093 const struct object_id *b_oid = NULL;
1094 int a_mode = 0;
1095 int b_mode = 0;
1096
1097 if (rename_branch == o->branch1) {
1098 a_oid = &dest->oid;
1099 a_mode = dest->mode;
1100 } else {
1101 b_oid = &dest->oid;
1102 b_mode = dest->mode;
1103 }
1104
1105 if (handle_change_delete(o,
1106 o->call_depth ? orig->path : dest->path,
1107 &orig->oid, orig->mode,
1108 a_oid, a_mode,
1109 b_oid, b_mode,
1110 _("rename"), _("renamed")))
1111 return -1;
1112
1113 if (o->call_depth)
1114 return remove_file_from_cache(dest->path);
1115 else
1116 return update_stages(dest->path, NULL,
1117 rename_branch == o->branch1 ? dest : NULL,
1118 rename_branch == o->branch1 ? NULL : dest);
1119}
1120
1121static struct diff_filespec *filespec_from_entry(struct diff_filespec *target,
1122 struct stage_data *entry,
1123 int stage)
1124{
1125 struct object_id *oid = &entry->stages[stage].oid;
1126 unsigned mode = entry->stages[stage].mode;
1127 if (mode == 0 || is_null_oid(oid))
1128 return NULL;
1129 oidcpy(&target->oid, oid);
1130 target->mode = mode;
1131 return target;
1132}
1133
1134static int handle_file(struct merge_options *o,
1135 struct diff_filespec *rename,
1136 int stage,
1137 struct rename_conflict_info *ci)
1138{
1139 char *dst_name = rename->path;
1140 struct stage_data *dst_entry;
1141 const char *cur_branch, *other_branch;
1142 struct diff_filespec other;
1143 struct diff_filespec *add;
1144 int ret;
1145
1146 if (stage == 2) {
1147 dst_entry = ci->dst_entry1;
1148 cur_branch = ci->branch1;
1149 other_branch = ci->branch2;
1150 } else {
1151 dst_entry = ci->dst_entry2;
1152 cur_branch = ci->branch2;
1153 other_branch = ci->branch1;
1154 }
1155
1156 add = filespec_from_entry(&other, dst_entry, stage ^ 1);
1157 if (add) {
1158 char *add_name = unique_path(o, rename->path, other_branch);
1159 if (update_file(o, 0, &add->oid, add->mode, add_name))
1160 return -1;
1161
1162 remove_file(o, 0, rename->path, 0);
1163 dst_name = unique_path(o, rename->path, cur_branch);
1164 } else {
1165 if (dir_in_way(rename->path, !o->call_depth)) {
1166 dst_name = unique_path(o, rename->path, cur_branch);
1167 output(o, 1, _("%s is a directory in %s adding as %s instead"),
1168 rename->path, other_branch, dst_name);
1169 }
1170 }
1171 if ((ret = update_file(o, 0, &rename->oid, rename->mode, dst_name)))
1172 ; /* fall through, do allow dst_name to be released */
1173 else if (stage == 2)
1174 ret = update_stages(rename->path, NULL, rename, add);
1175 else
1176 ret = update_stages(rename->path, NULL, add, rename);
1177
1178 if (dst_name != rename->path)
1179 free(dst_name);
1180
1181 return ret;
1182}
1183
1184static int conflict_rename_rename_1to2(struct merge_options *o,
1185 struct rename_conflict_info *ci)
1186{
1187 /* One file was renamed in both branches, but to different names. */
1188 struct diff_filespec *one = ci->pair1->one;
1189 struct diff_filespec *a = ci->pair1->two;
1190 struct diff_filespec *b = ci->pair2->two;
1191
1192 output(o, 1, _("CONFLICT (rename/rename): "
1193 "Rename \"%s\"->\"%s\" in branch \"%s\" "
1194 "rename \"%s\"->\"%s\" in \"%s\"%s"),
1195 one->path, a->path, ci->branch1,
1196 one->path, b->path, ci->branch2,
1197 o->call_depth ? _(" (left unresolved)") : "");
1198 if (o->call_depth) {
1199 struct merge_file_info mfi;
1200 struct diff_filespec other;
1201 struct diff_filespec *add;
1202 if (merge_file_one(o, one->path,
1203 &one->oid, one->mode,
1204 &a->oid, a->mode,
1205 &b->oid, b->mode,
1206 ci->branch1, ci->branch2, &mfi))
1207 return -1;
1208
1209 /*
1210 * FIXME: For rename/add-source conflicts (if we could detect
1211 * such), this is wrong. We should instead find a unique
1212 * pathname and then either rename the add-source file to that
1213 * unique path, or use that unique path instead of src here.
1214 */
1215 if (update_file(o, 0, &mfi.oid, mfi.mode, one->path))
1216 return -1;
1217
1218 /*
1219 * Above, we put the merged content at the merge-base's
1220 * path. Now we usually need to delete both a->path and
1221 * b->path. However, the rename on each side of the merge
1222 * could also be involved in a rename/add conflict. In
1223 * such cases, we should keep the added file around,
1224 * resolving the conflict at that path in its favor.
1225 */
1226 add = filespec_from_entry(&other, ci->dst_entry1, 2 ^ 1);
1227 if (add) {
1228 if (update_file(o, 0, &add->oid, add->mode, a->path))
1229 return -1;
1230 }
1231 else
1232 remove_file_from_cache(a->path);
1233 add = filespec_from_entry(&other, ci->dst_entry2, 3 ^ 1);
1234 if (add) {
1235 if (update_file(o, 0, &add->oid, add->mode, b->path))
1236 return -1;
1237 }
1238 else
1239 remove_file_from_cache(b->path);
1240 } else if (handle_file(o, a, 2, ci) || handle_file(o, b, 3, ci))
1241 return -1;
1242
1243 return 0;
1244}
1245
1246static int conflict_rename_rename_2to1(struct merge_options *o,
1247 struct rename_conflict_info *ci)
1248{
1249 /* Two files, a & b, were renamed to the same thing, c. */
1250 struct diff_filespec *a = ci->pair1->one;
1251 struct diff_filespec *b = ci->pair2->one;
1252 struct diff_filespec *c1 = ci->pair1->two;
1253 struct diff_filespec *c2 = ci->pair2->two;
1254 char *path = c1->path; /* == c2->path */
1255 struct merge_file_info mfi_c1;
1256 struct merge_file_info mfi_c2;
1257 int ret;
1258
1259 output(o, 1, _("CONFLICT (rename/rename): "
1260 "Rename %s->%s in %s. "
1261 "Rename %s->%s in %s"),
1262 a->path, c1->path, ci->branch1,
1263 b->path, c2->path, ci->branch2);
1264
1265 remove_file(o, 1, a->path, o->call_depth || would_lose_untracked(a->path));
1266 remove_file(o, 1, b->path, o->call_depth || would_lose_untracked(b->path));
1267
1268 if (merge_file_special_markers(o, a, c1, &ci->ren1_other,
1269 o->branch1, c1->path,
1270 o->branch2, ci->ren1_other.path, &mfi_c1) ||
1271 merge_file_special_markers(o, b, &ci->ren2_other, c2,
1272 o->branch1, ci->ren2_other.path,
1273 o->branch2, c2->path, &mfi_c2))
1274 return -1;
1275
1276 if (o->call_depth) {
1277 /*
1278 * If mfi_c1.clean && mfi_c2.clean, then it might make
1279 * sense to do a two-way merge of those results. But, I
1280 * think in all cases, it makes sense to have the virtual
1281 * merge base just undo the renames; they can be detected
1282 * again later for the non-recursive merge.
1283 */
1284 remove_file(o, 0, path, 0);
1285 ret = update_file(o, 0, &mfi_c1.oid, mfi_c1.mode, a->path);
1286 if (!ret)
1287 ret = update_file(o, 0, &mfi_c2.oid, mfi_c2.mode,
1288 b->path);
1289 } else {
1290 char *new_path1 = unique_path(o, path, ci->branch1);
1291 char *new_path2 = unique_path(o, path, ci->branch2);
1292 output(o, 1, _("Renaming %s to %s and %s to %s instead"),
1293 a->path, new_path1, b->path, new_path2);
1294 remove_file(o, 0, path, 0);
1295 ret = update_file(o, 0, &mfi_c1.oid, mfi_c1.mode, new_path1);
1296 if (!ret)
1297 ret = update_file(o, 0, &mfi_c2.oid, mfi_c2.mode,
1298 new_path2);
1299 free(new_path2);
1300 free(new_path1);
1301 }
1302
1303 return ret;
1304}
1305
1306static int process_renames(struct merge_options *o,
1307 struct string_list *a_renames,
1308 struct string_list *b_renames)
1309{
1310 int clean_merge = 1, i, j;
1311 struct string_list a_by_dst = STRING_LIST_INIT_NODUP;
1312 struct string_list b_by_dst = STRING_LIST_INIT_NODUP;
1313 const struct rename *sre;
1314
1315 for (i = 0; i < a_renames->nr; i++) {
1316 sre = a_renames->items[i].util;
1317 string_list_insert(&a_by_dst, sre->pair->two->path)->util
1318 = (void *)sre;
1319 }
1320 for (i = 0; i < b_renames->nr; i++) {
1321 sre = b_renames->items[i].util;
1322 string_list_insert(&b_by_dst, sre->pair->two->path)->util
1323 = (void *)sre;
1324 }
1325
1326 for (i = 0, j = 0; i < a_renames->nr || j < b_renames->nr;) {
1327 struct string_list *renames1, *renames2Dst;
1328 struct rename *ren1 = NULL, *ren2 = NULL;
1329 const char *branch1, *branch2;
1330 const char *ren1_src, *ren1_dst;
1331 struct string_list_item *lookup;
1332
1333 if (i >= a_renames->nr) {
1334 ren2 = b_renames->items[j++].util;
1335 } else if (j >= b_renames->nr) {
1336 ren1 = a_renames->items[i++].util;
1337 } else {
1338 int compare = strcmp(a_renames->items[i].string,
1339 b_renames->items[j].string);
1340 if (compare <= 0)
1341 ren1 = a_renames->items[i++].util;
1342 if (compare >= 0)
1343 ren2 = b_renames->items[j++].util;
1344 }
1345
1346 /* TODO: refactor, so that 1/2 are not needed */
1347 if (ren1) {
1348 renames1 = a_renames;
1349 renames2Dst = &b_by_dst;
1350 branch1 = o->branch1;
1351 branch2 = o->branch2;
1352 } else {
1353 struct rename *tmp;
1354 renames1 = b_renames;
1355 renames2Dst = &a_by_dst;
1356 branch1 = o->branch2;
1357 branch2 = o->branch1;
1358 tmp = ren2;
1359 ren2 = ren1;
1360 ren1 = tmp;
1361 }
1362
1363 if (ren1->processed)
1364 continue;
1365 ren1->processed = 1;
1366 ren1->dst_entry->processed = 1;
1367 /* BUG: We should only mark src_entry as processed if we
1368 * are not dealing with a rename + add-source case.
1369 */
1370 ren1->src_entry->processed = 1;
1371
1372 ren1_src = ren1->pair->one->path;
1373 ren1_dst = ren1->pair->two->path;
1374
1375 if (ren2) {
1376 /* One file renamed on both sides */
1377 const char *ren2_src = ren2->pair->one->path;
1378 const char *ren2_dst = ren2->pair->two->path;
1379 enum rename_type rename_type;
1380 if (strcmp(ren1_src, ren2_src) != 0)
1381 die("BUG: ren1_src != ren2_src");
1382 ren2->dst_entry->processed = 1;
1383 ren2->processed = 1;
1384 if (strcmp(ren1_dst, ren2_dst) != 0) {
1385 rename_type = RENAME_ONE_FILE_TO_TWO;
1386 clean_merge = 0;
1387 } else {
1388 rename_type = RENAME_ONE_FILE_TO_ONE;
1389 /* BUG: We should only remove ren1_src in
1390 * the base stage (think of rename +
1391 * add-source cases).
1392 */
1393 remove_file(o, 1, ren1_src, 1);
1394 update_entry(ren1->dst_entry,
1395 ren1->pair->one,
1396 ren1->pair->two,
1397 ren2->pair->two);
1398 }
1399 setup_rename_conflict_info(rename_type,
1400 ren1->pair,
1401 ren2->pair,
1402 branch1,
1403 branch2,
1404 ren1->dst_entry,
1405 ren2->dst_entry,
1406 o,
1407 NULL,
1408 NULL);
1409 } else if ((lookup = string_list_lookup(renames2Dst, ren1_dst))) {
1410 /* Two different files renamed to the same thing */
1411 char *ren2_dst;
1412 ren2 = lookup->util;
1413 ren2_dst = ren2->pair->two->path;
1414 if (strcmp(ren1_dst, ren2_dst) != 0)
1415 die("BUG: ren1_dst != ren2_dst");
1416
1417 clean_merge = 0;
1418 ren2->processed = 1;
1419 /*
1420 * BUG: We should only mark src_entry as processed
1421 * if we are not dealing with a rename + add-source
1422 * case.
1423 */
1424 ren2->src_entry->processed = 1;
1425
1426 setup_rename_conflict_info(RENAME_TWO_FILES_TO_ONE,
1427 ren1->pair,
1428 ren2->pair,
1429 branch1,
1430 branch2,
1431 ren1->dst_entry,
1432 ren2->dst_entry,
1433 o,
1434 ren1->src_entry,
1435 ren2->src_entry);
1436
1437 } else {
1438 /* Renamed in 1, maybe changed in 2 */
1439 /* we only use sha1 and mode of these */
1440 struct diff_filespec src_other, dst_other;
1441 int try_merge;
1442
1443 /*
1444 * unpack_trees loads entries from common-commit
1445 * into stage 1, from head-commit into stage 2, and
1446 * from merge-commit into stage 3. We keep track
1447 * of which side corresponds to the rename.
1448 */
1449 int renamed_stage = a_renames == renames1 ? 2 : 3;
1450 int other_stage = a_renames == renames1 ? 3 : 2;
1451
1452 /* BUG: We should only remove ren1_src in the base
1453 * stage and in other_stage (think of rename +
1454 * add-source case).
1455 */
1456 remove_file(o, 1, ren1_src,
1457 renamed_stage == 2 || !was_tracked(ren1_src));
1458
1459 oidcpy(&src_other.oid,
1460 &ren1->src_entry->stages[other_stage].oid);
1461 src_other.mode = ren1->src_entry->stages[other_stage].mode;
1462 oidcpy(&dst_other.oid,
1463 &ren1->dst_entry->stages[other_stage].oid);
1464 dst_other.mode = ren1->dst_entry->stages[other_stage].mode;
1465 try_merge = 0;
1466
1467 if (oid_eq(&src_other.oid, &null_oid)) {
1468 setup_rename_conflict_info(RENAME_DELETE,
1469 ren1->pair,
1470 NULL,
1471 branch1,
1472 branch2,
1473 ren1->dst_entry,
1474 NULL,
1475 o,
1476 NULL,
1477 NULL);
1478 } else if ((dst_other.mode == ren1->pair->two->mode) &&
1479 oid_eq(&dst_other.oid, &ren1->pair->two->oid)) {
1480 /*
1481 * Added file on the other side identical to
1482 * the file being renamed: clean merge.
1483 * Also, there is no need to overwrite the
1484 * file already in the working copy, so call
1485 * update_file_flags() instead of
1486 * update_file().
1487 */
1488 if (update_file_flags(o,
1489 &ren1->pair->two->oid,
1490 ren1->pair->two->mode,
1491 ren1_dst,
1492 1, /* update_cache */
1493 0 /* update_wd */))
1494 clean_merge = -1;
1495 } else if (!oid_eq(&dst_other.oid, &null_oid)) {
1496 clean_merge = 0;
1497 try_merge = 1;
1498 output(o, 1, _("CONFLICT (rename/add): Rename %s->%s in %s. "
1499 "%s added in %s"),
1500 ren1_src, ren1_dst, branch1,
1501 ren1_dst, branch2);
1502 if (o->call_depth) {
1503 struct merge_file_info mfi;
1504 if (merge_file_one(o, ren1_dst, &null_oid, 0,
1505 &ren1->pair->two->oid,
1506 ren1->pair->two->mode,
1507 &dst_other.oid,
1508 dst_other.mode,
1509 branch1, branch2, &mfi)) {
1510 clean_merge = -1;
1511 goto cleanup_and_return;
1512 }
1513 output(o, 1, _("Adding merged %s"), ren1_dst);
1514 if (update_file(o, 0, &mfi.oid,
1515 mfi.mode, ren1_dst))
1516 clean_merge = -1;
1517 try_merge = 0;
1518 } else {
1519 char *new_path = unique_path(o, ren1_dst, branch2);
1520 output(o, 1, _("Adding as %s instead"), new_path);
1521 if (update_file(o, 0, &dst_other.oid,
1522 dst_other.mode, new_path))
1523 clean_merge = -1;
1524 free(new_path);
1525 }
1526 } else
1527 try_merge = 1;
1528
1529 if (clean_merge < 0)
1530 goto cleanup_and_return;
1531 if (try_merge) {
1532 struct diff_filespec *one, *a, *b;
1533 src_other.path = (char *)ren1_src;
1534
1535 one = ren1->pair->one;
1536 if (a_renames == renames1) {
1537 a = ren1->pair->two;
1538 b = &src_other;
1539 } else {
1540 b = ren1->pair->two;
1541 a = &src_other;
1542 }
1543 update_entry(ren1->dst_entry, one, a, b);
1544 setup_rename_conflict_info(RENAME_NORMAL,
1545 ren1->pair,
1546 NULL,
1547 branch1,
1548 NULL,
1549 ren1->dst_entry,
1550 NULL,
1551 o,
1552 NULL,
1553 NULL);
1554 }
1555 }
1556 }
1557cleanup_and_return:
1558 string_list_clear(&a_by_dst, 0);
1559 string_list_clear(&b_by_dst, 0);
1560
1561 return clean_merge;
1562}
1563
1564static struct object_id *stage_oid(const struct object_id *oid, unsigned mode)
1565{
1566 return (is_null_oid(oid) || mode == 0) ? NULL: (struct object_id *)oid;
1567}
1568
1569static int read_oid_strbuf(const struct object_id *oid, struct strbuf *dst)
1570{
1571 void *buf;
1572 enum object_type type;
1573 unsigned long size;
1574 buf = read_sha1_file(oid->hash, &type, &size);
1575 if (!buf)
1576 return error(_("cannot read object %s"), oid_to_hex(oid));
1577 if (type != OBJ_BLOB) {
1578 free(buf);
1579 return error(_("object %s is not a blob"), oid_to_hex(oid));
1580 }
1581 strbuf_attach(dst, buf, size, size + 1);
1582 return 0;
1583}
1584
1585static int blob_unchanged(const struct object_id *o_oid,
1586 unsigned o_mode,
1587 const struct object_id *a_oid,
1588 unsigned a_mode,
1589 int renormalize, const char *path)
1590{
1591 struct strbuf o = STRBUF_INIT;
1592 struct strbuf a = STRBUF_INIT;
1593 int ret = 0; /* assume changed for safety */
1594
1595 if (a_mode != o_mode)
1596 return 0;
1597 if (oid_eq(o_oid, a_oid))
1598 return 1;
1599 if (!renormalize)
1600 return 0;
1601
1602 assert(o_oid && a_oid);
1603 if (read_oid_strbuf(o_oid, &o) || read_oid_strbuf(a_oid, &a))
1604 goto error_return;
1605 /*
1606 * Note: binary | is used so that both renormalizations are
1607 * performed. Comparison can be skipped if both files are
1608 * unchanged since their sha1s have already been compared.
1609 */
1610 if (renormalize_buffer(path, o.buf, o.len, &o) |
1611 renormalize_buffer(path, a.buf, a.len, &a))
1612 ret = (o.len == a.len && !memcmp(o.buf, a.buf, o.len));
1613
1614error_return:
1615 strbuf_release(&o);
1616 strbuf_release(&a);
1617 return ret;
1618}
1619
1620static int handle_modify_delete(struct merge_options *o,
1621 const char *path,
1622 struct object_id *o_oid, int o_mode,
1623 struct object_id *a_oid, int a_mode,
1624 struct object_id *b_oid, int b_mode)
1625{
1626 return handle_change_delete(o,
1627 path,
1628 o_oid, o_mode,
1629 a_oid, a_mode,
1630 b_oid, b_mode,
1631 _("modify"), _("modified"));
1632}
1633
1634static int merge_content(struct merge_options *o,
1635 const char *path,
1636 struct object_id *o_oid, int o_mode,
1637 struct object_id *a_oid, int a_mode,
1638 struct object_id *b_oid, int b_mode,
1639 struct rename_conflict_info *rename_conflict_info)
1640{
1641 const char *reason = _("content");
1642 const char *path1 = NULL, *path2 = NULL;
1643 struct merge_file_info mfi;
1644 struct diff_filespec one, a, b;
1645 unsigned df_conflict_remains = 0;
1646
1647 if (!o_oid) {
1648 reason = _("add/add");
1649 o_oid = (struct object_id *)&null_oid;
1650 }
1651 one.path = a.path = b.path = (char *)path;
1652 oidcpy(&one.oid, o_oid);
1653 one.mode = o_mode;
1654 oidcpy(&a.oid, a_oid);
1655 a.mode = a_mode;
1656 oidcpy(&b.oid, b_oid);
1657 b.mode = b_mode;
1658
1659 if (rename_conflict_info) {
1660 struct diff_filepair *pair1 = rename_conflict_info->pair1;
1661
1662 path1 = (o->branch1 == rename_conflict_info->branch1) ?
1663 pair1->two->path : pair1->one->path;
1664 /* If rename_conflict_info->pair2 != NULL, we are in
1665 * RENAME_ONE_FILE_TO_ONE case. Otherwise, we have a
1666 * normal rename.
1667 */
1668 path2 = (rename_conflict_info->pair2 ||
1669 o->branch2 == rename_conflict_info->branch1) ?
1670 pair1->two->path : pair1->one->path;
1671
1672 if (dir_in_way(path, !o->call_depth))
1673 df_conflict_remains = 1;
1674 }
1675 if (merge_file_special_markers(o, &one, &a, &b,
1676 o->branch1, path1,
1677 o->branch2, path2, &mfi))
1678 return -1;
1679
1680 if (mfi.clean && !df_conflict_remains &&
1681 oid_eq(&mfi.oid, a_oid) && mfi.mode == a_mode) {
1682 int path_renamed_outside_HEAD;
1683 output(o, 3, _("Skipped %s (merged same as existing)"), path);
1684 /*
1685 * The content merge resulted in the same file contents we
1686 * already had. We can return early if those file contents
1687 * are recorded at the correct path (which may not be true
1688 * if the merge involves a rename).
1689 */
1690 path_renamed_outside_HEAD = !path2 || !strcmp(path, path2);
1691 if (!path_renamed_outside_HEAD) {
1692 add_cacheinfo(mfi.mode, &mfi.oid, path,
1693 0, (!o->call_depth), 0);
1694 return mfi.clean;
1695 }
1696 } else
1697 output(o, 2, _("Auto-merging %s"), path);
1698
1699 if (!mfi.clean) {
1700 if (S_ISGITLINK(mfi.mode))
1701 reason = _("submodule");
1702 output(o, 1, _("CONFLICT (%s): Merge conflict in %s"),
1703 reason, path);
1704 if (rename_conflict_info && !df_conflict_remains)
1705 if (update_stages(path, &one, &a, &b))
1706 return -1;
1707 }
1708
1709 if (df_conflict_remains) {
1710 char *new_path;
1711 if (o->call_depth) {
1712 remove_file_from_cache(path);
1713 } else {
1714 if (!mfi.clean) {
1715 if (update_stages(path, &one, &a, &b))
1716 return -1;
1717 } else {
1718 int file_from_stage2 = was_tracked(path);
1719 struct diff_filespec merged;
1720 oidcpy(&merged.oid, &mfi.oid);
1721 merged.mode = mfi.mode;
1722
1723 if (update_stages(path, NULL,
1724 file_from_stage2 ? &merged : NULL,
1725 file_from_stage2 ? NULL : &merged))
1726 return -1;
1727 }
1728
1729 }
1730 new_path = unique_path(o, path, rename_conflict_info->branch1);
1731 output(o, 1, _("Adding as %s instead"), new_path);
1732 if (update_file(o, 0, &mfi.oid, mfi.mode, new_path)) {
1733 free(new_path);
1734 return -1;
1735 }
1736 free(new_path);
1737 mfi.clean = 0;
1738 } else if (update_file(o, mfi.clean, &mfi.oid, mfi.mode, path))
1739 return -1;
1740 return mfi.clean;
1741}
1742
1743/* Per entry merge function */
1744static int process_entry(struct merge_options *o,
1745 const char *path, struct stage_data *entry)
1746{
1747 int clean_merge = 1;
1748 int normalize = o->renormalize;
1749 unsigned o_mode = entry->stages[1].mode;
1750 unsigned a_mode = entry->stages[2].mode;
1751 unsigned b_mode = entry->stages[3].mode;
1752 struct object_id *o_oid = stage_oid(&entry->stages[1].oid, o_mode);
1753 struct object_id *a_oid = stage_oid(&entry->stages[2].oid, a_mode);
1754 struct object_id *b_oid = stage_oid(&entry->stages[3].oid, b_mode);
1755
1756 entry->processed = 1;
1757 if (entry->rename_conflict_info) {
1758 struct rename_conflict_info *conflict_info = entry->rename_conflict_info;
1759 switch (conflict_info->rename_type) {
1760 case RENAME_NORMAL:
1761 case RENAME_ONE_FILE_TO_ONE:
1762 clean_merge = merge_content(o, path,
1763 o_oid, o_mode, a_oid, a_mode, b_oid, b_mode,
1764 conflict_info);
1765 break;
1766 case RENAME_DELETE:
1767 clean_merge = 0;
1768 if (conflict_rename_delete(o,
1769 conflict_info->pair1,
1770 conflict_info->branch1,
1771 conflict_info->branch2))
1772 clean_merge = -1;
1773 break;
1774 case RENAME_ONE_FILE_TO_TWO:
1775 clean_merge = 0;
1776 if (conflict_rename_rename_1to2(o, conflict_info))
1777 clean_merge = -1;
1778 break;
1779 case RENAME_TWO_FILES_TO_ONE:
1780 clean_merge = 0;
1781 if (conflict_rename_rename_2to1(o, conflict_info))
1782 clean_merge = -1;
1783 break;
1784 default:
1785 entry->processed = 0;
1786 break;
1787 }
1788 } else if (o_oid && (!a_oid || !b_oid)) {
1789 /* Case A: Deleted in one */
1790 if ((!a_oid && !b_oid) ||
1791 (!b_oid && blob_unchanged(o_oid, o_mode, a_oid, a_mode, normalize, path)) ||
1792 (!a_oid && blob_unchanged(o_oid, o_mode, b_oid, b_mode, normalize, path))) {
1793 /* Deleted in both or deleted in one and
1794 * unchanged in the other */
1795 if (a_oid)
1796 output(o, 2, _("Removing %s"), path);
1797 /* do not touch working file if it did not exist */
1798 remove_file(o, 1, path, !a_oid);
1799 } else {
1800 /* Modify/delete; deleted side may have put a directory in the way */
1801 clean_merge = 0;
1802 if (handle_modify_delete(o, path, o_oid, o_mode,
1803 a_oid, a_mode, b_oid, b_mode))
1804 clean_merge = -1;
1805 }
1806 } else if ((!o_oid && a_oid && !b_oid) ||
1807 (!o_oid && !a_oid && b_oid)) {
1808 /* Case B: Added in one. */
1809 /* [nothing|directory] -> ([nothing|directory], file) */
1810
1811 const char *add_branch;
1812 const char *other_branch;
1813 unsigned mode;
1814 const struct object_id *oid;
1815 const char *conf;
1816
1817 if (a_oid) {
1818 add_branch = o->branch1;
1819 other_branch = o->branch2;
1820 mode = a_mode;
1821 oid = a_oid;
1822 conf = _("file/directory");
1823 } else {
1824 add_branch = o->branch2;
1825 other_branch = o->branch1;
1826 mode = b_mode;
1827 oid = b_oid;
1828 conf = _("directory/file");
1829 }
1830 if (dir_in_way(path, !o->call_depth)) {
1831 char *new_path = unique_path(o, path, add_branch);
1832 clean_merge = 0;
1833 output(o, 1, _("CONFLICT (%s): There is a directory with name %s in %s. "
1834 "Adding %s as %s"),
1835 conf, path, other_branch, path, new_path);
1836 if (update_file(o, 0, oid, mode, new_path))
1837 clean_merge = -1;
1838 else if (o->call_depth)
1839 remove_file_from_cache(path);
1840 free(new_path);
1841 } else {
1842 output(o, 2, _("Adding %s"), path);
1843 /* do not overwrite file if already present */
1844 if (update_file_flags(o, oid, mode, path, 1, !a_oid))
1845 clean_merge = -1;
1846 }
1847 } else if (a_oid && b_oid) {
1848 /* Case C: Added in both (check for same permissions) and */
1849 /* case D: Modified in both, but differently. */
1850 clean_merge = merge_content(o, path,
1851 o_oid, o_mode, a_oid, a_mode, b_oid, b_mode,
1852 NULL);
1853 } else if (!o_oid && !a_oid && !b_oid) {
1854 /*
1855 * this entry was deleted altogether. a_mode == 0 means
1856 * we had that path and want to actively remove it.
1857 */
1858 remove_file(o, 1, path, !a_mode);
1859 } else
1860 die("BUG: fatal merge failure, shouldn't happen.");
1861
1862 return clean_merge;
1863}
1864
1865int merge_trees(struct merge_options *o,
1866 struct tree *head,
1867 struct tree *merge,
1868 struct tree *common,
1869 struct tree **result)
1870{
1871 int code, clean;
1872
1873 if (o->subtree_shift) {
1874 merge = shift_tree_object(head, merge, o->subtree_shift);
1875 common = shift_tree_object(head, common, o->subtree_shift);
1876 }
1877
1878 if (oid_eq(&common->object.oid, &merge->object.oid)) {
1879 output(o, 0, _("Already up-to-date!"));
1880 *result = head;
1881 return 1;
1882 }
1883
1884 code = git_merge_trees(o->call_depth, common, head, merge);
1885
1886 if (code != 0) {
1887 if (show(o, 4) || o->call_depth)
1888 die(_("merging of trees %s and %s failed"),
1889 oid_to_hex(&head->object.oid),
1890 oid_to_hex(&merge->object.oid));
1891 else
1892 exit(128);
1893 }
1894
1895 if (unmerged_cache()) {
1896 struct string_list *entries, *re_head, *re_merge;
1897 int i;
1898 string_list_clear(&o->current_file_set, 1);
1899 string_list_clear(&o->current_directory_set, 1);
1900 get_files_dirs(o, head);
1901 get_files_dirs(o, merge);
1902
1903 entries = get_unmerged();
1904 record_df_conflict_files(o, entries);
1905 re_head = get_renames(o, head, common, head, merge, entries);
1906 re_merge = get_renames(o, merge, common, head, merge, entries);
1907 clean = process_renames(o, re_head, re_merge);
1908 if (clean < 0)
1909 return clean;
1910 for (i = entries->nr-1; 0 <= i; i--) {
1911 const char *path = entries->items[i].string;
1912 struct stage_data *e = entries->items[i].util;
1913 if (!e->processed) {
1914 int ret = process_entry(o, path, e);
1915 if (!ret)
1916 clean = 0;
1917 else if (ret < 0)
1918 return ret;
1919 }
1920 }
1921 for (i = 0; i < entries->nr; i++) {
1922 struct stage_data *e = entries->items[i].util;
1923 if (!e->processed)
1924 die("BUG: unprocessed path??? %s",
1925 entries->items[i].string);
1926 }
1927
1928 string_list_clear(re_merge, 0);
1929 string_list_clear(re_head, 0);
1930 string_list_clear(entries, 1);
1931
1932 free(re_merge);
1933 free(re_head);
1934 free(entries);
1935 }
1936 else
1937 clean = 1;
1938
1939 if (o->call_depth && !(*result = write_tree_from_memory(o)))
1940 return -1;
1941
1942 return clean;
1943}
1944
1945static struct commit_list *reverse_commit_list(struct commit_list *list)
1946{
1947 struct commit_list *next = NULL, *current, *backup;
1948 for (current = list; current; current = backup) {
1949 backup = current->next;
1950 current->next = next;
1951 next = current;
1952 }
1953 return next;
1954}
1955
1956/*
1957 * Merge the commits h1 and h2, return the resulting virtual
1958 * commit object and a flag indicating the cleanness of the merge.
1959 */
1960int merge_recursive(struct merge_options *o,
1961 struct commit *h1,
1962 struct commit *h2,
1963 struct commit_list *ca,
1964 struct commit **result)
1965{
1966 struct commit_list *iter;
1967 struct commit *merged_common_ancestors;
1968 struct tree *mrtree = mrtree;
1969 int clean;
1970
1971 if (show(o, 4)) {
1972 output(o, 4, _("Merging:"));
1973 output_commit_title(o, h1);
1974 output_commit_title(o, h2);
1975 }
1976
1977 if (!ca) {
1978 ca = get_merge_bases(h1, h2);
1979 ca = reverse_commit_list(ca);
1980 }
1981
1982 if (show(o, 5)) {
1983 unsigned cnt = commit_list_count(ca);
1984
1985 output(o, 5, Q_("found %u common ancestor:",
1986 "found %u common ancestors:", cnt), cnt);
1987 for (iter = ca; iter; iter = iter->next)
1988 output_commit_title(o, iter->item);
1989 }
1990
1991 merged_common_ancestors = pop_commit(&ca);
1992 if (merged_common_ancestors == NULL) {
1993 /* if there is no common ancestor, use an empty tree */
1994 struct tree *tree;
1995
1996 tree = lookup_tree(EMPTY_TREE_SHA1_BIN);
1997 merged_common_ancestors = make_virtual_commit(tree, "ancestor");
1998 }
1999
2000 for (iter = ca; iter; iter = iter->next) {
2001 const char *saved_b1, *saved_b2;
2002 o->call_depth++;
2003 /*
2004 * When the merge fails, the result contains files
2005 * with conflict markers. The cleanness flag is
2006 * ignored (unless indicating an error), it was never
2007 * actually used, as result of merge_trees has always
2008 * overwritten it: the committed "conflicts" were
2009 * already resolved.
2010 */
2011 discard_cache();
2012 saved_b1 = o->branch1;
2013 saved_b2 = o->branch2;
2014 o->branch1 = "Temporary merge branch 1";
2015 o->branch2 = "Temporary merge branch 2";
2016 if (merge_recursive(o, merged_common_ancestors, iter->item,
2017 NULL, &merged_common_ancestors) < 0)
2018 return -1;
2019 o->branch1 = saved_b1;
2020 o->branch2 = saved_b2;
2021 o->call_depth--;
2022
2023 if (!merged_common_ancestors)
2024 die(_("merge returned no commit"));
2025 }
2026
2027 discard_cache();
2028 if (!o->call_depth)
2029 read_cache();
2030
2031 o->ancestor = "merged common ancestors";
2032 clean = merge_trees(o, h1->tree, h2->tree, merged_common_ancestors->tree,
2033 &mrtree);
2034 if (clean < 0)
2035 return clean;
2036
2037 if (o->call_depth) {
2038 *result = make_virtual_commit(mrtree, "merged tree");
2039 commit_list_insert(h1, &(*result)->parents);
2040 commit_list_insert(h2, &(*result)->parents->next);
2041 }
2042 flush_output(o);
2043 if (show(o, 2))
2044 diff_warn_rename_limit("merge.renamelimit",
2045 o->needed_rename_limit, 0);
2046 return clean;
2047}
2048
2049static struct commit *get_ref(const struct object_id *oid, const char *name)
2050{
2051 struct object *object;
2052
2053 object = deref_tag(parse_object(oid->hash), name, strlen(name));
2054 if (!object)
2055 return NULL;
2056 if (object->type == OBJ_TREE)
2057 return make_virtual_commit((struct tree*)object, name);
2058 if (object->type != OBJ_COMMIT)
2059 return NULL;
2060 if (parse_commit((struct commit *)object))
2061 return NULL;
2062 return (struct commit *)object;
2063}
2064
2065int merge_recursive_generic(struct merge_options *o,
2066 const struct object_id *head,
2067 const struct object_id *merge,
2068 int num_base_list,
2069 const struct object_id **base_list,
2070 struct commit **result)
2071{
2072 int clean;
2073 struct lock_file *lock = xcalloc(1, sizeof(struct lock_file));
2074 struct commit *head_commit = get_ref(head, o->branch1);
2075 struct commit *next_commit = get_ref(merge, o->branch2);
2076 struct commit_list *ca = NULL;
2077
2078 if (base_list) {
2079 int i;
2080 for (i = 0; i < num_base_list; ++i) {
2081 struct commit *base;
2082 if (!(base = get_ref(base_list[i], oid_to_hex(base_list[i]))))
2083 return error(_("Could not parse object '%s'"),
2084 oid_to_hex(base_list[i]));
2085 commit_list_insert(base, &ca);
2086 }
2087 }
2088
2089 hold_locked_index(lock, 1);
2090 clean = merge_recursive(o, head_commit, next_commit, ca,
2091 result);
2092 if (clean < 0)
2093 return clean;
2094
2095 if (active_cache_changed &&
2096 write_locked_index(&the_index, lock, COMMIT_LOCK))
2097 return error(_("Unable to write index."));
2098
2099 return clean ? 0 : 1;
2100}
2101
2102static void merge_recursive_config(struct merge_options *o)
2103{
2104 git_config_get_int("merge.verbosity", &o->verbosity);
2105 git_config_get_int("diff.renamelimit", &o->diff_rename_limit);
2106 git_config_get_int("merge.renamelimit", &o->merge_rename_limit);
2107 git_config(git_xmerge_config, NULL);
2108}
2109
2110void init_merge_options(struct merge_options *o)
2111{
2112 memset(o, 0, sizeof(struct merge_options));
2113 o->verbosity = 2;
2114 o->buffer_output = 1;
2115 o->diff_rename_limit = -1;
2116 o->merge_rename_limit = -1;
2117 o->renormalize = 0;
2118 o->detect_rename = 1;
2119 merge_recursive_config(o);
2120 if (getenv("GIT_MERGE_VERBOSITY"))
2121 o->verbosity =
2122 strtol(getenv("GIT_MERGE_VERBOSITY"), NULL, 10);
2123 if (o->verbosity >= 5)
2124 o->buffer_output = 0;
2125 strbuf_init(&o->obuf, 0);
2126 string_list_init(&o->current_file_set, 1);
2127 string_list_init(&o->current_directory_set, 1);
2128 string_list_init(&o->df_conflict_file_set, 1);
2129}
2130
2131int parse_merge_opt(struct merge_options *o, const char *s)
2132{
2133 const char *arg;
2134
2135 if (!s || !*s)
2136 return -1;
2137 if (!strcmp(s, "ours"))
2138 o->recursive_variant = MERGE_RECURSIVE_OURS;
2139 else if (!strcmp(s, "theirs"))
2140 o->recursive_variant = MERGE_RECURSIVE_THEIRS;
2141 else if (!strcmp(s, "subtree"))
2142 o->subtree_shift = "";
2143 else if (skip_prefix(s, "subtree=", &arg))
2144 o->subtree_shift = arg;
2145 else if (!strcmp(s, "patience"))
2146 o->xdl_opts = DIFF_WITH_ALG(o, PATIENCE_DIFF);
2147 else if (!strcmp(s, "histogram"))
2148 o->xdl_opts = DIFF_WITH_ALG(o, HISTOGRAM_DIFF);
2149 else if (skip_prefix(s, "diff-algorithm=", &arg)) {
2150 long value = parse_algorithm_value(arg);
2151 if (value < 0)
2152 return -1;
2153 /* clear out previous settings */
2154 DIFF_XDL_CLR(o, NEED_MINIMAL);
2155 o->xdl_opts &= ~XDF_DIFF_ALGORITHM_MASK;
2156 o->xdl_opts |= value;
2157 }
2158 else if (!strcmp(s, "ignore-space-change"))
2159 o->xdl_opts |= XDF_IGNORE_WHITESPACE_CHANGE;
2160 else if (!strcmp(s, "ignore-all-space"))
2161 o->xdl_opts |= XDF_IGNORE_WHITESPACE;
2162 else if (!strcmp(s, "ignore-space-at-eol"))
2163 o->xdl_opts |= XDF_IGNORE_WHITESPACE_AT_EOL;
2164 else if (!strcmp(s, "renormalize"))
2165 o->renormalize = 1;
2166 else if (!strcmp(s, "no-renormalize"))
2167 o->renormalize = 0;
2168 else if (!strcmp(s, "no-renames"))
2169 o->detect_rename = 0;
2170 else if (!strcmp(s, "find-renames")) {
2171 o->detect_rename = 1;
2172 o->rename_score = 0;
2173 }
2174 else if (skip_prefix(s, "find-renames=", &arg) ||
2175 skip_prefix(s, "rename-threshold=", &arg)) {
2176 if ((o->rename_score = parse_rename_score(&arg)) == -1 || *arg != 0)
2177 return -1;
2178 o->detect_rename = 1;
2179 }
2180 else
2181 return -1;
2182 return 0;
2183}