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