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