merge-recursive: use abbreviated commit object name.
[git/git.git] / merge-recursive.c
CommitLineData
6d297f81
JS
1/*
2 * Recursive Merge algorithm stolen from git-merge-recursive.py by
3 * Fredrik Kuivinen.
4 * The thieves were Alex Riesen and Johannes Schindelin, in June/July 2006
5 */
6#include <stdarg.h>
7#include <string.h>
8#include <assert.h>
9#include <sys/wait.h>
10#include <sys/types.h>
11#include <sys/stat.h>
12#include <time.h>
13#include "cache.h"
14#include "cache-tree.h"
15#include "commit.h"
16#include "blob.h"
17#include "tree-walk.h"
18#include "diff.h"
19#include "diffcore.h"
20#include "run-command.h"
21#include "tag.h"
7a85b848 22#include "unpack-trees.h"
6d297f81
JS
23#include "path-list.h"
24
6d297f81
JS
25/*
26 * A virtual commit has
27 * - (const char *)commit->util set to the name, and
28 * - *(int *)commit->object.sha1 set to the virtual id.
29 */
6d297f81
JS
30
31static unsigned commit_list_count(const struct commit_list *l)
32{
33 unsigned c = 0;
34 for (; l; l = l->next )
35 c++;
36 return c;
37}
38
39static struct commit *make_virtual_commit(struct tree *tree, const char *comment)
40{
41 struct commit *commit = xcalloc(1, sizeof(struct commit));
42 static unsigned virtual_id = 1;
43 commit->tree = tree;
44 commit->util = (void*)comment;
45 *(int*)commit->object.sha1 = virtual_id++;
c1f3089e
JS
46 /* avoid warnings */
47 commit->object.parsed = 1;
6d297f81
JS
48 return commit;
49}
50
51/*
3058e933
JS
52 * Since we use get_tree_entry(), which does not put the read object into
53 * the object pool, we cannot rely on a == b.
6d297f81
JS
54 */
55static int sha_eq(const unsigned char *a, const unsigned char *b)
56{
3af244ca 57 if (!a && !b)
6d297f81 58 return 2;
87cb004e 59 return a && b && hashcmp(a, b) == 0;
6d297f81
JS
60}
61
6d297f81 62/*
3058e933
JS
63 * Since we want to write the index eventually, we cannot reuse the index
64 * for these (temporary) data.
6d297f81
JS
65 */
66struct stage_data
67{
68 struct
69 {
70 unsigned mode;
71 unsigned char sha[20];
72 } stages[4];
73 unsigned processed:1;
74};
75
5a753613
JS
76static struct path_list current_file_set = {NULL, 0, 0, 1};
77static struct path_list current_directory_set = {NULL, 0, 0, 1};
6d297f81
JS
78
79static int output_indent = 0;
80
81static void output(const char *fmt, ...)
82{
83 va_list args;
84 int i;
3af244ca 85 for (i = output_indent; i--;)
6d297f81
JS
86 fputs(" ", stdout);
87 va_start(args, fmt);
88 vfprintf(stdout, fmt, args);
89 va_end(args);
90 fputc('\n', stdout);
91}
92
3af244ca
JS
93static void output_commit_title(struct commit *commit)
94{
95 int i;
96 for (i = output_indent; i--;)
97 fputs(" ", stdout);
98 if (commit->util)
99 printf("virtual %s\n", (char *)commit->util);
100 else {
9926ba98 101 printf("%s ", find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV));
3af244ca
JS
102 if (parse_commit(commit) != 0)
103 printf("(bad commit)\n");
104 else {
105 const char *s;
106 int len;
107 for (s = commit->buffer; *s; s++)
108 if (*s == '\n' && s[1] == '\n') {
109 s += 2;
110 break;
111 }
112 for (len = 0; s[len] && '\n' != s[len]; len++)
113 ; /* do nothing */
114 printf("%.*s\n", len, s);
115 }
116 }
117}
118
c1964a00 119static const char *current_index_file = NULL;
6d297f81
JS
120static const char *original_index_file;
121static const char *temporary_index_file;
122static int cache_dirty = 0;
123
3af244ca 124static int flush_cache(void)
6d297f81
JS
125{
126 /* flush temporary index */
127 struct lock_file *lock = xcalloc(1, sizeof(struct lock_file));
eed94a57 128 int fd = hold_lock_file_for_update(lock, current_index_file, 1);
6d297f81
JS
129 if (write_cache(fd, active_cache, active_nr) ||
130 close(fd) || commit_lock_file(lock))
c1964a00 131 die ("unable to write %s", current_index_file);
6d297f81
JS
132 discard_cache();
133 cache_dirty = 0;
134 return 0;
135}
136
137static void setup_index(int temp)
138{
c1964a00 139 current_index_file = temp ? temporary_index_file: original_index_file;
984b6570
JS
140 if (cache_dirty) {
141 discard_cache();
142 cache_dirty = 0;
143 }
6d297f81 144 unlink(temporary_index_file);
6d297f81
JS
145 discard_cache();
146}
147
148static struct cache_entry *make_cache_entry(unsigned int mode,
149 const unsigned char *sha1, const char *path, int stage, int refresh)
150{
151 int size, len;
152 struct cache_entry *ce;
153
154 if (!verify_path(path))
155 return NULL;
156
157 len = strlen(path);
158 size = cache_entry_size(len);
159 ce = xcalloc(1, size);
160
8da71493 161 hashcpy(ce->sha1, sha1);
6d297f81
JS
162 memcpy(ce->name, path, len);
163 ce->ce_flags = create_ce_flags(len, stage);
164 ce->ce_mode = create_ce_mode(mode);
165
166 if (refresh)
167 return refresh_cache_entry(ce, 0);
168
169 return ce;
170}
171
172static int add_cacheinfo(unsigned int mode, const unsigned char *sha1,
173 const char *path, int stage, int refresh, int options)
174{
175 struct cache_entry *ce;
176 if (!cache_dirty)
c1964a00 177 read_cache_from(current_index_file);
6d297f81
JS
178 cache_dirty++;
179 ce = make_cache_entry(mode, sha1 ? sha1 : null_sha1, path, stage, refresh);
180 if (!ce)
181 return error("cache_addinfo failed: %s", strerror(cache_errno));
182 return add_cache_entry(ce, options);
183}
184
185/*
186 * This is a global variable which is used in a number of places but
187 * only written to in the 'merge' function.
188 *
189 * index_only == 1 => Don't leave any non-stage 0 entries in the cache and
190 * don't update the working directory.
191 * 0 => Leave unmerged entries in the cache and update
192 * the working directory.
193 */
194static int index_only = 0;
195
7a85b848 196static int git_read_tree(struct tree *tree)
6d297f81 197{
3af244ca 198 int rc;
7a85b848
JS
199 struct object_list *trees = NULL;
200 struct unpack_trees_options opts;
201
6d297f81
JS
202 if (cache_dirty)
203 die("read-tree with dirty cache");
7a85b848
JS
204
205 memset(&opts, 0, sizeof(opts));
206 object_list_append(&tree->object, &trees);
207 rc = unpack_trees(trees, &opts);
208 cache_tree_free(&active_cache_tree);
209
210 if (rc == 0)
211 cache_dirty = 1;
212
213 return rc;
6d297f81
JS
214}
215
7a85b848 216static int git_merge_trees(int index_only,
6d297f81
JS
217 struct tree *common,
218 struct tree *head,
219 struct tree *merge)
220{
3af244ca 221 int rc;
7a85b848
JS
222 struct object_list *trees = NULL;
223 struct unpack_trees_options opts;
224
225 if (!cache_dirty) {
c1964a00 226 read_cache_from(current_index_file);
7a85b848
JS
227 cache_dirty = 1;
228 }
229
230 memset(&opts, 0, sizeof(opts));
231 if (index_only)
232 opts.index_only = 1;
233 else
234 opts.update = 1;
235 opts.merge = 1;
236 opts.head_idx = 2;
237 opts.fn = threeway_merge;
238
239 object_list_append(&common->object, &trees);
240 object_list_append(&head->object, &trees);
241 object_list_append(&merge->object, &trees);
242
243 rc = unpack_trees(trees, &opts);
244 cache_tree_free(&active_cache_tree);
245
246 cache_dirty = 1;
247
248 return rc;
6d297f81
JS
249}
250
3af244ca 251static struct tree *git_write_tree(void)
6d297f81 252{
5b982f84
JS
253 struct tree *result = NULL;
254
7a85b848 255 if (cache_dirty) {
5b982f84 256 unsigned i;
7a85b848
JS
257 for (i = 0; i < active_nr; i++) {
258 struct cache_entry *ce = active_cache[i];
259 if (ce_stage(ce))
260 return NULL;
261 }
5b982f84 262 } else
c1964a00 263 read_cache_from(current_index_file);
5b982f84
JS
264
265 if (!active_cache_tree)
266 active_cache_tree = cache_tree();
267
268 if (!cache_tree_fully_valid(active_cache_tree) &&
269 cache_tree_update(active_cache_tree,
270 active_cache, active_nr, 0, 0) < 0)
271 die("error building trees");
272
273 result = lookup_tree(active_cache_tree->sha1);
274
275 flush_cache();
276 cache_dirty = 0;
277
278 return result;
6d297f81
JS
279}
280
6d297f81
JS
281static int save_files_dirs(const unsigned char *sha1,
282 const char *base, int baselen, const char *path,
283 unsigned int mode, int stage)
284{
285 int len = strlen(path);
2d7320d0 286 char *newpath = xmalloc(baselen + len + 1);
6d297f81
JS
287 memcpy(newpath, base, baselen);
288 memcpy(newpath + baselen, path, len);
289 newpath[baselen + len] = '\0';
290
291 if (S_ISDIR(mode))
5a753613 292 path_list_insert(newpath, &current_directory_set);
6d297f81 293 else
5a753613 294 path_list_insert(newpath, &current_file_set);
6d297f81
JS
295 free(newpath);
296
297 return READ_TREE_RECURSIVE;
298}
299
3af244ca 300static int get_files_dirs(struct tree *tree)
6d297f81
JS
301{
302 int n;
bd669986 303 if (read_tree_recursive(tree, "", 0, 0, NULL, save_files_dirs) != 0)
6d297f81 304 return 0;
5a753613 305 n = current_file_set.nr + current_directory_set.nr;
6d297f81
JS
306 return n;
307}
308
6d297f81
JS
309/*
310 * Returns a index_entry instance which doesn't have to correspond to
311 * a real cache entry in Git's index.
312 */
3af244ca
JS
313static struct stage_data *insert_stage_data(const char *path,
314 struct tree *o, struct tree *a, struct tree *b,
315 struct path_list *entries)
6d297f81 316{
3af244ca 317 struct path_list_item *item;
6d297f81
JS
318 struct stage_data *e = xcalloc(1, sizeof(struct stage_data));
319 get_tree_entry(o->object.sha1, path,
320 e->stages[1].sha, &e->stages[1].mode);
321 get_tree_entry(a->object.sha1, path,
322 e->stages[2].sha, &e->stages[2].mode);
323 get_tree_entry(b->object.sha1, path,
324 e->stages[3].sha, &e->stages[3].mode);
3af244ca
JS
325 item = path_list_insert(path, entries);
326 item->util = e;
6d297f81
JS
327 return e;
328}
329
6d297f81 330/*
5a753613 331 * Create a dictionary mapping file names to stage_data objects. The
6d297f81
JS
332 * dictionary contains one entry for every path with a non-zero stage entry.
333 */
3af244ca 334static struct path_list *get_unmerged(void)
6d297f81
JS
335{
336 struct path_list *unmerged = xcalloc(1, sizeof(struct path_list));
337 int i;
338
339 unmerged->strdup_paths = 1;
340 if (!cache_dirty) {
c1964a00 341 read_cache_from(current_index_file);
6d297f81
JS
342 cache_dirty++;
343 }
344 for (i = 0; i < active_nr; i++) {
3af244ca
JS
345 struct path_list_item *item;
346 struct stage_data *e;
6d297f81
JS
347 struct cache_entry *ce = active_cache[i];
348 if (!ce_stage(ce))
349 continue;
350
3af244ca
JS
351 item = path_list_lookup(ce->name, unmerged);
352 if (!item) {
353 item = path_list_insert(ce->name, unmerged);
354 item->util = xcalloc(1, sizeof(struct stage_data));
355 }
356 e = item->util;
6d297f81 357 e->stages[ce_stage(ce)].mode = ntohl(ce->ce_mode);
8da71493 358 hashcpy(e->stages[ce_stage(ce)].sha, ce->sha1);
6d297f81
JS
359 }
360
6d297f81
JS
361 return unmerged;
362}
363
364struct rename
365{
366 struct diff_filepair *pair;
367 struct stage_data *src_entry;
368 struct stage_data *dst_entry;
369 unsigned processed:1;
370};
371
6d297f81 372/*
5a753613
JS
373 * Get information of all renames which occured between 'o_tree' and
374 * 'tree'. We need the three trees in the merge ('o_tree', 'a_tree' and
375 * 'b_tree') to be able to associate the correct cache entries with
376 * the rename information. 'tree' is always equal to either a_tree or b_tree.
6d297f81
JS
377 */
378static struct path_list *get_renames(struct tree *tree,
5a753613
JS
379 struct tree *o_tree,
380 struct tree *a_tree,
381 struct tree *b_tree,
6d297f81
JS
382 struct path_list *entries)
383{
3af244ca
JS
384 int i;
385 struct path_list *renames;
386 struct diff_options opts;
3af244ca
JS
387
388 renames = xcalloc(1, sizeof(struct path_list));
6d297f81
JS
389 diff_setup(&opts);
390 opts.recursive = 1;
391 opts.detect_rename = DIFF_DETECT_RENAME;
392 opts.output_format = DIFF_FORMAT_NO_OUTPUT;
393 if (diff_setup_done(&opts) < 0)
394 die("diff setup failed");
5a753613 395 diff_tree_sha1(o_tree->object.sha1, tree->object.sha1, "", &opts);
6d297f81
JS
396 diffcore_std(&opts);
397 for (i = 0; i < diff_queued_diff.nr; ++i) {
3af244ca 398 struct path_list_item *item;
6d297f81
JS
399 struct rename *re;
400 struct diff_filepair *pair = diff_queued_diff.queue[i];
401 if (pair->status != 'R') {
402 diff_free_filepair(pair);
403 continue;
404 }
405 re = xmalloc(sizeof(*re));
406 re->processed = 0;
407 re->pair = pair;
3af244ca
JS
408 item = path_list_lookup(re->pair->one->path, entries);
409 if (!item)
410 re->src_entry = insert_stage_data(re->pair->one->path,
5a753613 411 o_tree, a_tree, b_tree, entries);
3af244ca
JS
412 else
413 re->src_entry = item->util;
414
415 item = path_list_lookup(re->pair->two->path, entries);
416 if (!item)
417 re->dst_entry = insert_stage_data(re->pair->two->path,
5a753613 418 o_tree, a_tree, b_tree, entries);
3af244ca
JS
419 else
420 re->dst_entry = item->util;
421 item = path_list_insert(pair->one->path, renames);
6d297f81
JS
422 item->util = re;
423 }
424 opts.output_format = DIFF_FORMAT_NO_OUTPUT;
425 diff_queued_diff.nr = 0;
426 diff_flush(&opts);
6d297f81
JS
427 return renames;
428}
429
3af244ca
JS
430int update_stages(const char *path, struct diff_filespec *o,
431 struct diff_filespec *a, struct diff_filespec *b, int clear)
6d297f81
JS
432{
433 int options = ADD_CACHE_OK_TO_ADD | ADD_CACHE_OK_TO_REPLACE;
3af244ca
JS
434 if (clear)
435 if (remove_file_from_cache(path))
6d297f81 436 return -1;
3af244ca
JS
437 if (o)
438 if (add_cacheinfo(o->mode, o->sha1, path, 1, 0, options))
6d297f81 439 return -1;
3af244ca
JS
440 if (a)
441 if (add_cacheinfo(a->mode, a->sha1, path, 2, 0, options))
6d297f81 442 return -1;
3af244ca
JS
443 if (b)
444 if (add_cacheinfo(b->mode, b->sha1, path, 3, 0, options))
6d297f81
JS
445 return -1;
446 return 0;
447}
448
6d297f81
JS
449static int remove_path(const char *name)
450{
3af244ca
JS
451 int ret, len;
452 char *slash, *dirs;
6d297f81
JS
453
454 ret = unlink(name);
3af244ca 455 if (ret)
6d297f81 456 return ret;
3af244ca 457 len = strlen(name);
2d7320d0 458 dirs = xmalloc(len+1);
6d297f81
JS
459 memcpy(dirs, name, len);
460 dirs[len] = '\0';
3af244ca 461 while ((slash = strrchr(name, '/'))) {
6d297f81
JS
462 *slash = '\0';
463 len = slash - name;
3af244ca 464 if (rmdir(name) != 0)
6d297f81
JS
465 break;
466 }
467 free(dirs);
468 return ret;
469}
470
6d297f81
JS
471int remove_file(int clean, const char *path)
472{
5a753613
JS
473 int update_cache = index_only || clean;
474 int update_working_directory = !index_only;
6d297f81 475
5a753613 476 if (update_cache) {
6d297f81 477 if (!cache_dirty)
c1964a00 478 read_cache_from(current_index_file);
6d297f81
JS
479 cache_dirty++;
480 if (remove_file_from_cache(path))
481 return -1;
482 }
5a753613 483 if (update_working_directory)
6d297f81
JS
484 {
485 unlink(path);
3af244ca 486 if (errno != ENOENT || errno != EISDIR)
6d297f81
JS
487 return -1;
488 remove_path(path);
489 }
490 return 0;
491}
492
493static char *unique_path(const char *path, const char *branch)
494{
495 char *newpath = xmalloc(strlen(path) + 1 + strlen(branch) + 8 + 1);
3af244ca
JS
496 int suffix = 0;
497 struct stat st;
f59aac47 498 char *p = newpath + strlen(path);
6d297f81 499 strcpy(newpath, path);
f59aac47 500 *(p++) = '~';
6d297f81 501 strcpy(p, branch);
3af244ca
JS
502 for (; *p; ++p)
503 if ('/' == *p)
6d297f81 504 *p = '_';
5a753613
JS
505 while (path_list_has_path(&current_file_set, newpath) ||
506 path_list_has_path(&current_directory_set, newpath) ||
3af244ca 507 lstat(newpath, &st) == 0)
6d297f81 508 sprintf(p, "_%d", suffix++);
3af244ca 509
5a753613 510 path_list_insert(newpath, &current_file_set);
6d297f81
JS
511 return newpath;
512}
513
3af244ca 514static int mkdir_p(const char *path, unsigned long mode)
6d297f81 515{
9befac47
SP
516 /* path points to cache entries, so xstrdup before messing with it */
517 char *buf = xstrdup(path);
3af244ca 518 int result = safe_create_leading_directories(buf);
6d297f81 519 free(buf);
3af244ca 520 return result;
6d297f81
JS
521}
522
523static void flush_buffer(int fd, const char *buf, unsigned long size)
524{
525 while (size > 0) {
526 long ret = xwrite(fd, buf, size);
527 if (ret < 0) {
528 /* Ignore epipe */
529 if (errno == EPIPE)
530 break;
531 die("merge-recursive: %s", strerror(errno));
532 } else if (!ret) {
533 die("merge-recursive: disk full?");
534 }
535 size -= ret;
536 buf += ret;
537 }
538}
539
6d297f81 540void update_file_flags(const unsigned char *sha,
3af244ca
JS
541 unsigned mode,
542 const char *path,
543 int update_cache,
544 int update_wd)
6d297f81 545{
3af244ca
JS
546 if (index_only)
547 update_wd = 0;
6d297f81 548
3af244ca 549 if (update_wd) {
6d297f81
JS
550 char type[20];
551 void *buf;
552 unsigned long size;
553
554 buf = read_sha1_file(sha, type, &size);
555 if (!buf)
556 die("cannot read object %s '%s'", sha1_to_hex(sha), path);
3af244ca 557 if (strcmp(type, blob_type) != 0)
6d297f81
JS
558 die("blob expected for %s '%s'", sha1_to_hex(sha), path);
559
3af244ca
JS
560 if (S_ISREG(mode)) {
561 int fd;
562 if (mkdir_p(path, 0777))
6d297f81
JS
563 die("failed to create path %s: %s", path, strerror(errno));
564 unlink(path);
3af244ca 565 if (mode & 0100)
6d297f81
JS
566 mode = 0777;
567 else
568 mode = 0666;
3af244ca
JS
569 fd = open(path, O_WRONLY | O_TRUNC | O_CREAT, mode);
570 if (fd < 0)
6d297f81
JS
571 die("failed to open %s: %s", path, strerror(errno));
572 flush_buffer(fd, buf, size);
573 close(fd);
3af244ca 574 } else if (S_ISLNK(mode)) {
2d7320d0 575 char *lnk = xmalloc(size + 1);
3af244ca
JS
576 memcpy(lnk, buf, size);
577 lnk[size] = '\0';
578 mkdir_p(path, 0777);
579 unlink(lnk);
580 symlink(lnk, path);
6d297f81
JS
581 } else
582 die("do not know what to do with %06o %s '%s'",
583 mode, sha1_to_hex(sha), path);
584 }
3af244ca
JS
585 if (update_cache)
586 add_cacheinfo(mode, sha, path, 0, update_wd, ADD_CACHE_OK_TO_ADD);
6d297f81
JS
587}
588
6d297f81
JS
589void update_file(int clean,
590 const unsigned char *sha,
591 unsigned mode,
592 const char *path)
593{
594 update_file_flags(sha, mode, path, index_only || clean, !index_only);
595}
596
597/* Low level file merging, update and removal */
598
599struct merge_file_info
600{
601 unsigned char sha[20];
602 unsigned mode;
603 unsigned clean:1,
604 merge:1;
605};
606
607static char *git_unpack_file(const unsigned char *sha1, char *path)
608{
609 void *buf;
610 char type[20];
611 unsigned long size;
612 int fd;
613
614 buf = read_sha1_file(sha1, type, &size);
615 if (!buf || strcmp(type, blob_type))
616 die("unable to read blob object %s", sha1_to_hex(sha1));
617
618 strcpy(path, ".merge_file_XXXXXX");
619 fd = mkstemp(path);
620 if (fd < 0)
621 die("unable to create temp-file");
622 flush_buffer(fd, buf, size);
623 close(fd);
624 return path;
625}
626
3af244ca
JS
627static struct merge_file_info merge_file(struct diff_filespec *o,
628 struct diff_filespec *a, struct diff_filespec *b,
c1d20846 629 const char *branch1, const char *branch2)
6d297f81
JS
630{
631 struct merge_file_info result;
632 result.merge = 0;
633 result.clean = 1;
634
3af244ca 635 if ((S_IFMT & a->mode) != (S_IFMT & b->mode)) {
6d297f81 636 result.clean = 0;
3af244ca
JS
637 if (S_ISREG(a->mode)) {
638 result.mode = a->mode;
8da71493 639 hashcpy(result.sha, a->sha1);
6d297f81 640 } else {
3af244ca 641 result.mode = b->mode;
8da71493 642 hashcpy(result.sha, b->sha1);
6d297f81
JS
643 }
644 } else {
3af244ca 645 if (!sha_eq(a->sha1, o->sha1) && !sha_eq(b->sha1, o->sha1))
6d297f81
JS
646 result.merge = 1;
647
3af244ca 648 result.mode = a->mode == o->mode ? b->mode: a->mode;
6d297f81 649
3af244ca 650 if (sha_eq(a->sha1, o->sha1))
8da71493 651 hashcpy(result.sha, b->sha1);
3af244ca 652 else if (sha_eq(b->sha1, o->sha1))
8da71493 653 hashcpy(result.sha, a->sha1);
3af244ca
JS
654 else if (S_ISREG(a->mode)) {
655 int code = 1, fd;
656 struct stat st;
6d297f81
JS
657 char orig[PATH_MAX];
658 char src1[PATH_MAX];
659 char src2[PATH_MAX];
6d297f81
JS
660 const char *argv[] = {
661 "merge", "-L", NULL, "-L", NULL, "-L", NULL,
7b3f5daa 662 NULL, NULL, NULL,
6d297f81
JS
663 NULL
664 };
665 char *la, *lb, *lo;
3af244ca
JS
666
667 git_unpack_file(o->sha1, orig);
668 git_unpack_file(a->sha1, src1);
669 git_unpack_file(b->sha1, src2);
670
9befac47
SP
671 argv[2] = la = xstrdup(mkpath("%s/%s", branch1, a->path));
672 argv[6] = lb = xstrdup(mkpath("%s/%s", branch2, b->path));
673 argv[4] = lo = xstrdup(mkpath("orig/%s", o->path));
7b3f5daa
JS
674 argv[7] = src1;
675 argv[8] = orig;
676 argv[9] = src2,
6d297f81 677
6d297f81
JS
678 code = run_command_v(10, argv);
679
680 free(la);
681 free(lb);
682 free(lo);
3af244ca 683 if (code && code < -256) {
6d297f81
JS
684 die("Failed to execute 'merge'. merge(1) is used as the "
685 "file-level merge tool. Is 'merge' in your path?");
686 }
3af244ca 687 fd = open(src1, O_RDONLY);
6d297f81
JS
688 if (fd < 0 || fstat(fd, &st) < 0 ||
689 index_fd(result.sha, fd, &st, 1,
690 "blob"))
691 die("Unable to add %s to database", src1);
6d297f81
JS
692
693 unlink(orig);
694 unlink(src1);
695 unlink(src2);
696
697 result.clean = WEXITSTATUS(code) == 0;
698 } else {
3af244ca 699 if (!(S_ISLNK(a->mode) || S_ISLNK(b->mode)))
6d297f81
JS
700 die("cannot merge modes?");
701
8da71493 702 hashcpy(result.sha, a->sha1);
6d297f81 703
3af244ca 704 if (!sha_eq(a->sha1, b->sha1))
6d297f81
JS
705 result.clean = 0;
706 }
707 }
708
709 return result;
710}
711
712static void conflict_rename_rename(struct rename *ren1,
713 const char *branch1,
714 struct rename *ren2,
715 const char *branch2)
716{
717 char *del[2];
718 int delp = 0;
719 const char *ren1_dst = ren1->pair->two->path;
720 const char *ren2_dst = ren2->pair->two->path;
5a753613
JS
721 const char *dst_name1 = ren1_dst;
722 const char *dst_name2 = ren2_dst;
723 if (path_list_has_path(&current_directory_set, ren1_dst)) {
724 dst_name1 = del[delp++] = unique_path(ren1_dst, branch1);
6d297f81 725 output("%s is a directory in %s adding as %s instead",
5a753613 726 ren1_dst, branch2, dst_name1);
6d297f81
JS
727 remove_file(0, ren1_dst);
728 }
5a753613
JS
729 if (path_list_has_path(&current_directory_set, ren2_dst)) {
730 dst_name2 = del[delp++] = unique_path(ren2_dst, branch2);
6d297f81 731 output("%s is a directory in %s adding as %s instead",
5a753613 732 ren2_dst, branch1, dst_name2);
6d297f81
JS
733 remove_file(0, ren2_dst);
734 }
5a753613
JS
735 update_stages(dst_name1, NULL, ren1->pair->two, NULL, 1);
736 update_stages(dst_name2, NULL, NULL, ren2->pair->two, 1);
3af244ca 737 while (delp--)
6d297f81
JS
738 free(del[delp]);
739}
740
741static void conflict_rename_dir(struct rename *ren1,
742 const char *branch1)
743{
5a753613
JS
744 char *new_path = unique_path(ren1->pair->two->path, branch1);
745 output("Renaming %s to %s instead", ren1->pair->one->path, new_path);
6d297f81 746 remove_file(0, ren1->pair->two->path);
5a753613
JS
747 update_file(0, ren1->pair->two->sha1, ren1->pair->two->mode, new_path);
748 free(new_path);
6d297f81
JS
749}
750
751static void conflict_rename_rename_2(struct rename *ren1,
752 const char *branch1,
753 struct rename *ren2,
754 const char *branch2)
755{
5a753613
JS
756 char *new_path1 = unique_path(ren1->pair->two->path, branch1);
757 char *new_path2 = unique_path(ren2->pair->two->path, branch2);
6d297f81 758 output("Renaming %s to %s and %s to %s instead",
5a753613
JS
759 ren1->pair->one->path, new_path1,
760 ren2->pair->one->path, new_path2);
6d297f81 761 remove_file(0, ren1->pair->two->path);
5a753613
JS
762 update_file(0, ren1->pair->two->sha1, ren1->pair->two->mode, new_path1);
763 update_file(0, ren2->pair->two->sha1, ren2->pair->two->mode, new_path2);
764 free(new_path2);
765 free(new_path1);
6d297f81
JS
766}
767
5a753613
JS
768static int process_renames(struct path_list *a_renames,
769 struct path_list *b_renames,
770 const char *a_branch,
771 const char *b_branch)
6d297f81 772{
5a753613
JS
773 int clean_merge = 1, i, j;
774 struct path_list a_by_dst = {NULL, 0, 0, 0}, b_by_dst = {NULL, 0, 0, 0};
6d297f81
JS
775 const struct rename *sre;
776
5a753613
JS
777 for (i = 0; i < a_renames->nr; i++) {
778 sre = a_renames->items[i].util;
779 path_list_insert(sre->pair->two->path, &a_by_dst)->util
6d297f81
JS
780 = sre->dst_entry;
781 }
5a753613
JS
782 for (i = 0; i < b_renames->nr; i++) {
783 sre = b_renames->items[i].util;
784 path_list_insert(sre->pair->two->path, &b_by_dst)->util
6d297f81
JS
785 = sre->dst_entry;
786 }
787
5a753613 788 for (i = 0, j = 0; i < a_renames->nr || j < b_renames->nr;) {
3af244ca
JS
789 int compare;
790 char *src;
6d297f81 791 struct path_list *renames1, *renames2, *renames2Dst;
3af244ca 792 struct rename *ren1 = NULL, *ren2 = NULL;
5a753613 793 const char *branch1, *branch2;
3af244ca
JS
794 const char *ren1_src, *ren1_dst;
795
5a753613 796 if (i >= a_renames->nr) {
3af244ca 797 compare = 1;
5a753613
JS
798 ren2 = b_renames->items[j++].util;
799 } else if (j >= b_renames->nr) {
3af244ca 800 compare = -1;
5a753613 801 ren1 = a_renames->items[i++].util;
3af244ca 802 } else {
5a753613
JS
803 compare = strcmp(a_renames->items[i].path,
804 b_renames->items[j].path);
3d234d0a
JS
805 if (compare <= 0)
806 ren1 = a_renames->items[i++].util;
807 if (compare >= 0)
808 ren2 = b_renames->items[j++].util;
3af244ca
JS
809 }
810
6d297f81 811 /* TODO: refactor, so that 1/2 are not needed */
3af244ca 812 if (ren1) {
5a753613
JS
813 renames1 = a_renames;
814 renames2 = b_renames;
815 renames2Dst = &b_by_dst;
816 branch1 = a_branch;
817 branch2 = b_branch;
6d297f81 818 } else {
3af244ca 819 struct rename *tmp;
5a753613
JS
820 renames1 = b_renames;
821 renames2 = a_renames;
822 renames2Dst = &a_by_dst;
823 branch1 = b_branch;
824 branch2 = a_branch;
3af244ca 825 tmp = ren2;
6d297f81
JS
826 ren2 = ren1;
827 ren1 = tmp;
828 }
3af244ca 829 src = ren1->pair->one->path;
6d297f81
JS
830
831 ren1->dst_entry->processed = 1;
832 ren1->src_entry->processed = 1;
833
3af244ca 834 if (ren1->processed)
6d297f81
JS
835 continue;
836 ren1->processed = 1;
837
3af244ca
JS
838 ren1_src = ren1->pair->one->path;
839 ren1_dst = ren1->pair->two->path;
6d297f81 840
3af244ca 841 if (ren2) {
6d297f81
JS
842 const char *ren2_src = ren2->pair->one->path;
843 const char *ren2_dst = ren2->pair->two->path;
844 /* Renamed in 1 and renamed in 2 */
845 if (strcmp(ren1_src, ren2_src) != 0)
846 die("ren1.src != ren2.src");
847 ren2->dst_entry->processed = 1;
848 ren2->processed = 1;
849 if (strcmp(ren1_dst, ren2_dst) != 0) {
5a753613 850 clean_merge = 0;
6d297f81
JS
851 output("CONFLICT (rename/rename): "
852 "Rename %s->%s in branch %s "
853 "rename %s->%s in %s",
5a753613
JS
854 src, ren1_dst, branch1,
855 src, ren2_dst, branch2);
856 conflict_rename_rename(ren1, branch1, ren2, branch2);
6d297f81 857 } else {
6d297f81 858 struct merge_file_info mfi;
5a753613 859 remove_file(1, ren1_src);
3af244ca
JS
860 mfi = merge_file(ren1->pair->one,
861 ren1->pair->two,
862 ren2->pair->two,
5a753613
JS
863 branch1,
864 branch2);
3af244ca 865 if (mfi.merge || !mfi.clean)
6d297f81
JS
866 output("Renaming %s->%s", src, ren1_dst);
867
3af244ca 868 if (mfi.merge)
6d297f81
JS
869 output("Auto-merging %s", ren1_dst);
870
3af244ca 871 if (!mfi.clean) {
6d297f81
JS
872 output("CONFLICT (content): merge conflict in %s",
873 ren1_dst);
5a753613 874 clean_merge = 0;
6d297f81 875
3af244ca 876 if (!index_only)
6d297f81 877 update_stages(ren1_dst,
3af244ca
JS
878 ren1->pair->one,
879 ren1->pair->two,
880 ren2->pair->two,
6d297f81
JS
881 1 /* clear */);
882 }
883 update_file(mfi.clean, mfi.sha, mfi.mode, ren1_dst);
884 }
885 } else {
886 /* Renamed in 1, maybe changed in 2 */
3af244ca
JS
887 struct path_list_item *item;
888 /* we only use sha1 and mode of these */
889 struct diff_filespec src_other, dst_other;
5a753613 890 int try_merge, stage = a_renames == renames1 ? 3: 2;
6d297f81 891
3af244ca 892 remove_file(1, ren1_src);
6d297f81 893
87cb004e 894 hashcpy(src_other.sha1, ren1->src_entry->stages[stage].sha);
3af244ca 895 src_other.mode = ren1->src_entry->stages[stage].mode;
87cb004e 896 hashcpy(dst_other.sha1, ren1->dst_entry->stages[stage].sha);
3af244ca 897 dst_other.mode = ren1->dst_entry->stages[stage].mode;
6d297f81 898
5a753613 899 try_merge = 0;
6d297f81 900
5a753613
JS
901 if (path_list_has_path(&current_directory_set, ren1_dst)) {
902 clean_merge = 0;
6d297f81
JS
903 output("CONFLICT (rename/directory): Rename %s->%s in %s "
904 " directory %s added in %s",
5a753613
JS
905 ren1_src, ren1_dst, branch1,
906 ren1_dst, branch2);
907 conflict_rename_dir(ren1, branch1);
3af244ca 908 } else if (sha_eq(src_other.sha1, null_sha1)) {
5a753613 909 clean_merge = 0;
6d297f81
JS
910 output("CONFLICT (rename/delete): Rename %s->%s in %s "
911 "and deleted in %s",
5a753613
JS
912 ren1_src, ren1_dst, branch1,
913 branch2);
6d297f81 914 update_file(0, ren1->pair->two->sha1, ren1->pair->two->mode, ren1_dst);
3af244ca 915 } else if (!sha_eq(dst_other.sha1, null_sha1)) {
5a753613
JS
916 const char *new_path;
917 clean_merge = 0;
918 try_merge = 1;
6d297f81
JS
919 output("CONFLICT (rename/add): Rename %s->%s in %s. "
920 "%s added in %s",
5a753613
JS
921 ren1_src, ren1_dst, branch1,
922 ren1_dst, branch2);
923 new_path = unique_path(ren1_dst, branch2);
924 output("Adding as %s instead", new_path);
925 update_file(0, dst_other.sha1, dst_other.mode, new_path);
3af244ca
JS
926 } else if ((item = path_list_lookup(ren1_dst, renames2Dst))) {
927 ren2 = item->util;
5a753613 928 clean_merge = 0;
6d297f81
JS
929 ren2->processed = 1;
930 output("CONFLICT (rename/rename): Rename %s->%s in %s. "
931 "Rename %s->%s in %s",
5a753613
JS
932 ren1_src, ren1_dst, branch1,
933 ren2->pair->one->path, ren2->pair->two->path, branch2);
934 conflict_rename_rename_2(ren1, branch1, ren2, branch2);
6d297f81 935 } else
5a753613 936 try_merge = 1;
6d297f81 937
5a753613 938 if (try_merge) {
3af244ca 939 struct diff_filespec *o, *a, *b;
6d297f81 940 struct merge_file_info mfi;
3af244ca
JS
941 src_other.path = (char *)ren1_src;
942
943 o = ren1->pair->one;
5a753613 944 if (a_renames == renames1) {
3af244ca
JS
945 a = ren1->pair->two;
946 b = &src_other;
947 } else {
948 b = ren1->pair->two;
949 a = &src_other;
950 }
951 mfi = merge_file(o, a, b,
5a753613 952 a_branch, b_branch);
6d297f81 953
3af244ca 954 if (mfi.merge || !mfi.clean)
6d297f81 955 output("Renaming %s => %s", ren1_src, ren1_dst);
3af244ca 956 if (mfi.merge)
6d297f81 957 output("Auto-merging %s", ren1_dst);
3af244ca 958 if (!mfi.clean) {
6d297f81
JS
959 output("CONFLICT (rename/modify): Merge conflict in %s",
960 ren1_dst);
5a753613 961 clean_merge = 0;
6d297f81 962
3af244ca 963 if (!index_only)
6d297f81 964 update_stages(ren1_dst,
3af244ca 965 o, a, b, 1);
6d297f81
JS
966 }
967 update_file(mfi.clean, mfi.sha, mfi.mode, ren1_dst);
968 }
969 }
970 }
5a753613
JS
971 path_list_clear(&a_by_dst, 0);
972 path_list_clear(&b_by_dst, 0);
6d297f81
JS
973
974 if (cache_dirty)
975 flush_cache();
5a753613 976 return clean_merge;
6d297f81
JS
977}
978
979static unsigned char *has_sha(const unsigned char *sha)
980{
87cb004e 981 return is_null_sha1(sha) ? NULL: (unsigned char *)sha;
6d297f81
JS
982}
983
984/* Per entry merge function */
985static int process_entry(const char *path, struct stage_data *entry,
c1d20846
JS
986 const char *branch1,
987 const char *branch2)
6d297f81
JS
988{
989 /*
990 printf("processing entry, clean cache: %s\n", index_only ? "yes": "no");
991 print_index_entry("\tpath: ", entry);
992 */
5a753613
JS
993 int clean_merge = 1;
994 unsigned char *o_sha = has_sha(entry->stages[1].sha);
995 unsigned char *a_sha = has_sha(entry->stages[2].sha);
996 unsigned char *b_sha = has_sha(entry->stages[3].sha);
997 unsigned o_mode = entry->stages[1].mode;
998 unsigned a_mode = entry->stages[2].mode;
999 unsigned b_mode = entry->stages[3].mode;
1000
1001 if (o_sha && (!a_sha || !b_sha)) {
6d297f81 1002 /* Case A: Deleted in one */
5a753613
JS
1003 if ((!a_sha && !b_sha) ||
1004 (sha_eq(a_sha, o_sha) && !b_sha) ||
1005 (!a_sha && sha_eq(b_sha, o_sha))) {
6d297f81
JS
1006 /* Deleted in both or deleted in one and
1007 * unchanged in the other */
5a753613 1008 if (a_sha)
6d297f81
JS
1009 output("Removing %s", path);
1010 remove_file(1, path);
1011 } else {
1012 /* Deleted in one and changed in the other */
5a753613
JS
1013 clean_merge = 0;
1014 if (!a_sha) {
6d297f81
JS
1015 output("CONFLICT (delete/modify): %s deleted in %s "
1016 "and modified in %s. Version %s of %s left in tree.",
c1d20846
JS
1017 path, branch1,
1018 branch2, branch2, path);
5a753613 1019 update_file(0, b_sha, b_mode, path);
6d297f81
JS
1020 } else {
1021 output("CONFLICT (delete/modify): %s deleted in %s "
1022 "and modified in %s. Version %s of %s left in tree.",
c1d20846
JS
1023 path, branch2,
1024 branch1, branch1, path);
5a753613 1025 update_file(0, a_sha, a_mode, path);
6d297f81
JS
1026 }
1027 }
1028
5a753613
JS
1029 } else if ((!o_sha && a_sha && !b_sha) ||
1030 (!o_sha && !a_sha && b_sha)) {
6d297f81 1031 /* Case B: Added in one. */
5a753613
JS
1032 const char *add_branch;
1033 const char *other_branch;
6d297f81
JS
1034 unsigned mode;
1035 const unsigned char *sha;
1036 const char *conf;
1037
5a753613 1038 if (a_sha) {
c1d20846
JS
1039 add_branch = branch1;
1040 other_branch = branch2;
5a753613
JS
1041 mode = a_mode;
1042 sha = a_sha;
6d297f81
JS
1043 conf = "file/directory";
1044 } else {
c1d20846
JS
1045 add_branch = branch2;
1046 other_branch = branch1;
5a753613
JS
1047 mode = b_mode;
1048 sha = b_sha;
6d297f81
JS
1049 conf = "directory/file";
1050 }
5a753613
JS
1051 if (path_list_has_path(&current_directory_set, path)) {
1052 const char *new_path = unique_path(path, add_branch);
1053 clean_merge = 0;
6d297f81
JS
1054 output("CONFLICT (%s): There is a directory with name %s in %s. "
1055 "Adding %s as %s",
5a753613 1056 conf, path, other_branch, path, new_path);
6d297f81 1057 remove_file(0, path);
5a753613 1058 update_file(0, sha, mode, new_path);
6d297f81
JS
1059 } else {
1060 output("Adding %s", path);
1061 update_file(1, sha, mode, path);
1062 }
5a753613 1063 } else if (!o_sha && a_sha && b_sha) {
6d297f81 1064 /* Case C: Added in both (check for same permissions). */
5a753613
JS
1065 if (sha_eq(a_sha, b_sha)) {
1066 if (a_mode != b_mode) {
1067 clean_merge = 0;
6d297f81
JS
1068 output("CONFLICT: File %s added identically in both branches, "
1069 "but permissions conflict %06o->%06o",
5a753613
JS
1070 path, a_mode, b_mode);
1071 output("CONFLICT: adding with permission: %06o", a_mode);
1072 update_file(0, a_sha, a_mode, path);
6d297f81
JS
1073 } else {
1074 /* This case is handled by git-read-tree */
1075 assert(0 && "This case must be handled by git-read-tree");
1076 }
1077 } else {
5a753613
JS
1078 const char *new_path1, *new_path2;
1079 clean_merge = 0;
c1d20846
JS
1080 new_path1 = unique_path(path, branch1);
1081 new_path2 = unique_path(path, branch2);
6d297f81
JS
1082 output("CONFLICT (add/add): File %s added non-identically "
1083 "in both branches. Adding as %s and %s instead.",
5a753613 1084 path, new_path1, new_path2);
6d297f81 1085 remove_file(0, path);
5a753613
JS
1086 update_file(0, a_sha, a_mode, new_path1);
1087 update_file(0, b_sha, b_mode, new_path2);
6d297f81
JS
1088 }
1089
5a753613 1090 } else if (o_sha && a_sha && b_sha) {
6d297f81 1091 /* case D: Modified in both, but differently. */
6d297f81 1092 struct merge_file_info mfi;
3af244ca
JS
1093 struct diff_filespec o, a, b;
1094
1095 output("Auto-merging %s", path);
1096 o.path = a.path = b.path = (char *)path;
8da71493 1097 hashcpy(o.sha1, o_sha);
5a753613 1098 o.mode = o_mode;
8da71493 1099 hashcpy(a.sha1, a_sha);
5a753613 1100 a.mode = a_mode;
8da71493 1101 hashcpy(b.sha1, b_sha);
5a753613 1102 b.mode = b_mode;
3af244ca
JS
1103
1104 mfi = merge_file(&o, &a, &b,
c1d20846 1105 branch1, branch2);
6d297f81 1106
3af244ca 1107 if (mfi.clean)
6d297f81
JS
1108 update_file(1, mfi.sha, mfi.mode, path);
1109 else {
5a753613 1110 clean_merge = 0;
6d297f81
JS
1111 output("CONFLICT (content): Merge conflict in %s", path);
1112
3af244ca 1113 if (index_only)
6d297f81
JS
1114 update_file(0, mfi.sha, mfi.mode, path);
1115 else
1116 update_file_flags(mfi.sha, mfi.mode, path,
5a753613 1117 0 /* update_cache */, 1 /* update_working_directory */);
6d297f81
JS
1118 }
1119 } else
1120 die("Fatal merge failure, shouldn't happen.");
1121
1122 if (cache_dirty)
1123 flush_cache();
1124
5a753613 1125 return clean_merge;
6d297f81
JS
1126}
1127
3af244ca
JS
1128static int merge_trees(struct tree *head,
1129 struct tree *merge,
1130 struct tree *common,
c1d20846
JS
1131 const char *branch1,
1132 const char *branch2,
3af244ca 1133 struct tree **result)
6d297f81 1134{
3af244ca
JS
1135 int code, clean;
1136 if (sha_eq(common->object.sha1, merge->object.sha1)) {
6d297f81 1137 output("Already uptodate!");
3af244ca
JS
1138 *result = head;
1139 return 1;
6d297f81
JS
1140 }
1141
7a85b848 1142 code = git_merge_trees(index_only, common, head, merge);
6d297f81 1143
3af244ca 1144 if (code != 0)
6d297f81
JS
1145 die("merging of trees %s and %s failed",
1146 sha1_to_hex(head->object.sha1),
1147 sha1_to_hex(merge->object.sha1));
1148
3af244ca 1149 *result = git_write_tree();
6d297f81 1150
3af244ca
JS
1151 if (!*result) {
1152 struct path_list *entries, *re_head, *re_merge;
1153 int i;
5a753613
JS
1154 path_list_clear(&current_file_set, 1);
1155 path_list_clear(&current_directory_set, 1);
3af244ca
JS
1156 get_files_dirs(head);
1157 get_files_dirs(merge);
6d297f81 1158
3af244ca 1159 entries = get_unmerged();
6d297f81
JS
1160 re_head = get_renames(head, common, head, merge, entries);
1161 re_merge = get_renames(merge, common, head, merge, entries);
3af244ca 1162 clean = process_renames(re_head, re_merge,
c1d20846 1163 branch1, branch2);
6d297f81
JS
1164 for (i = 0; i < entries->nr; i++) {
1165 const char *path = entries->items[i].path;
1166 struct stage_data *e = entries->items[i].util;
1167 if (e->processed)
1168 continue;
c1d20846 1169 if (!process_entry(path, e, branch1, branch2))
3af244ca 1170 clean = 0;
6d297f81
JS
1171 }
1172
3af244ca
JS
1173 path_list_clear(re_merge, 0);
1174 path_list_clear(re_head, 0);
1175 path_list_clear(entries, 1);
6d297f81 1176
3af244ca
JS
1177 if (clean || index_only)
1178 *result = git_write_tree();
6d297f81 1179 else
3af244ca 1180 *result = NULL;
6d297f81 1181 } else {
3af244ca 1182 clean = 1;
6d297f81
JS
1183 printf("merging of trees %s and %s resulted in %s\n",
1184 sha1_to_hex(head->object.sha1),
1185 sha1_to_hex(merge->object.sha1),
3af244ca 1186 sha1_to_hex((*result)->object.sha1));
6d297f81
JS
1187 }
1188
3af244ca 1189 return clean;
6d297f81
JS
1190}
1191
8918b0c9
JS
1192static struct commit_list *reverse_commit_list(struct commit_list *list)
1193{
1194 struct commit_list *next = NULL, *current, *backup;
1195 for (current = list; current; current = backup) {
1196 backup = current->next;
1197 current->next = next;
1198 next = current;
1199 }
1200 return next;
1201}
1202
6d297f81
JS
1203/*
1204 * Merge the commits h1 and h2, return the resulting virtual
1205 * commit object and a flag indicating the cleaness of the merge.
1206 */
1207static
3af244ca 1208int merge(struct commit *h1,
6d297f81 1209 struct commit *h2,
c1d20846
JS
1210 const char *branch1,
1211 const char *branch2,
5a753613 1212 int call_depth /* =0 */,
3af244ca
JS
1213 struct commit *ancestor /* =None */,
1214 struct commit **result)
6d297f81 1215{
6d297f81 1216 struct commit_list *ca = NULL, *iter;
5a753613 1217 struct commit *merged_common_ancestors;
3af244ca
JS
1218 struct tree *mrtree;
1219 int clean;
6d297f81
JS
1220
1221 output("Merging:");
3af244ca
JS
1222 output_commit_title(h1);
1223 output_commit_title(h2);
6d297f81 1224
3af244ca 1225 if (ancestor)
6d297f81
JS
1226 commit_list_insert(ancestor, &ca);
1227 else
8918b0c9 1228 ca = reverse_commit_list(get_merge_bases(h1, h2, 1));
6d297f81
JS
1229
1230 output("found %u common ancestor(s):", commit_list_count(ca));
3af244ca
JS
1231 for (iter = ca; iter; iter = iter->next)
1232 output_commit_title(iter->item);
6d297f81 1233
5a753613 1234 merged_common_ancestors = pop_commit(&ca);
934d9a24
JS
1235 if (merged_common_ancestors == NULL) {
1236 /* if there is no common ancestor, make an empty tree */
1237 struct tree *tree = xcalloc(1, sizeof(struct tree));
934d9a24
JS
1238
1239 tree->object.parsed = 1;
1240 tree->object.type = OBJ_TREE;
abdc3fc8 1241 hash_sha1_file(NULL, 0, tree_type, tree->object.sha1);
934d9a24
JS
1242 merged_common_ancestors = make_virtual_commit(tree, "ancestor");
1243 }
6d297f81 1244
6d297f81 1245 for (iter = ca; iter; iter = iter->next) {
5a753613 1246 output_indent = call_depth + 1;
3af244ca
JS
1247 /*
1248 * When the merge fails, the result contains files
1249 * with conflict markers. The cleanness flag is
1250 * ignored, it was never acutally used, as result of
1251 * merge_trees has always overwritten it: the commited
1252 * "conflicts" were already resolved.
1253 */
5a753613 1254 merge(merged_common_ancestors, iter->item,
3af244ca
JS
1255 "Temporary merge branch 1",
1256 "Temporary merge branch 2",
5a753613 1257 call_depth + 1,
3af244ca 1258 NULL,
5a753613
JS
1259 &merged_common_ancestors);
1260 output_indent = call_depth;
6d297f81 1261
5a753613 1262 if (!merged_common_ancestors)
6d297f81
JS
1263 die("merge returned no commit");
1264 }
1265
5a753613 1266 if (call_depth == 0) {
3af244ca 1267 setup_index(0 /* $GIT_DIR/index */);
6d297f81
JS
1268 index_only = 0;
1269 } else {
3af244ca 1270 setup_index(1 /* temporary index */);
6d297f81
JS
1271 git_read_tree(h1->tree);
1272 index_only = 1;
1273 }
1274
5a753613 1275 clean = merge_trees(h1->tree, h2->tree, merged_common_ancestors->tree,
c1d20846 1276 branch1, branch2, &mrtree);
6d297f81 1277
3af244ca
JS
1278 if (!ancestor && (clean || index_only)) {
1279 *result = make_virtual_commit(mrtree, "merged tree");
1280 commit_list_insert(h1, &(*result)->parents);
1281 commit_list_insert(h2, &(*result)->parents->next);
6d297f81 1282 } else
3af244ca 1283 *result = NULL;
6d297f81 1284
3af244ca 1285 return clean;
6d297f81
JS
1286}
1287
1288static struct commit *get_ref(const char *ref)
1289{
1290 unsigned char sha1[20];
1291 struct object *object;
1292
1293 if (get_sha1(ref, sha1))
1294 die("Could not resolve ref '%s'", ref);
1295 object = deref_tag(parse_object(sha1), ref, strlen(ref));
bf6d324e 1296 if (object->type != OBJ_COMMIT)
6d297f81
JS
1297 return NULL;
1298 if (parse_commit((struct commit *)object))
1299 die("Could not parse commit '%s'", sha1_to_hex(object->sha1));
1300 return (struct commit *)object;
1301}
1302
1303int main(int argc, char *argv[])
1304{
1305 static const char *bases[2];
1306 static unsigned bases_count = 0;
3af244ca
JS
1307 int i, clean;
1308 const char *branch1, *branch2;
1309 struct commit *result, *h1, *h2;
6d297f81
JS
1310
1311 original_index_file = getenv("GIT_INDEX_FILE");
1312
1313 if (!original_index_file)
9befac47 1314 original_index_file = xstrdup(git_path("index"));
6d297f81 1315
9befac47 1316 temporary_index_file = xstrdup(git_path("mrg-rcrsv-tmp-idx"));
6d297f81
JS
1317
1318 if (argc < 4)
1319 die("Usage: %s <base>... -- <head> <remote> ...\n", argv[0]);
1320
6d297f81
JS
1321 for (i = 1; i < argc; ++i) {
1322 if (!strcmp(argv[i], "--"))
1323 break;
1324 if (bases_count < sizeof(bases)/sizeof(*bases))
1325 bases[bases_count++] = argv[i];
1326 }
1327 if (argc - i != 3) /* "--" "<head>" "<remote>" */
1328 die("Not handling anything other than two heads merge.");
1329
6d297f81
JS
1330 branch1 = argv[++i];
1331 branch2 = argv[++i];
1332 printf("Merging %s with %s\n", branch1, branch2);
1333
3af244ca
JS
1334 h1 = get_ref(branch1);
1335 h2 = get_ref(branch2);
6d297f81
JS
1336
1337 if (bases_count == 1) {
1338 struct commit *ancestor = get_ref(bases[0]);
3af244ca 1339 clean = merge(h1, h2, branch1, branch2, 0, ancestor, &result);
6d297f81 1340 } else
3af244ca 1341 clean = merge(h1, h2, branch1, branch2, 0, NULL, &result);
6d297f81
JS
1342
1343 if (cache_dirty)
1344 flush_cache();
1345
3af244ca 1346 return clean ? 0: 1;
6d297f81
JS
1347}
1348
1349/*
1350vim: sw=8 noet
1351*/