2 * Recursive Merge algorithm stolen from git-merge-recursive.py by
4 * The thieves were Alex Riesen and Johannes Schindelin, in June/July 2006
8 #include "cache-tree.h"
12 #include "tree-walk.h"
16 #include "unpack-trees.h"
17 #include "string-list.h"
18 #include "xdiff-interface.h"
21 #include "merge-recursive.h"
23 #include "submodule.h"
25 static struct tree
*shift_tree_object(struct tree
*one
, struct tree
*two
,
26 const char *subtree_shift
)
28 unsigned char shifted
[20];
30 if (!*subtree_shift
) {
31 shift_tree(one
->object
.sha1
, two
->object
.sha1
, shifted
, 0);
33 shift_tree_by(one
->object
.sha1
, two
->object
.sha1
, shifted
,
36 if (!hashcmp(two
->object
.sha1
, shifted
))
38 return lookup_tree(shifted
);
42 * A virtual commit has (const char *)commit->util set to the name.
45 static struct commit
*make_virtual_commit(struct tree
*tree
, const char *comment
)
47 struct commit
*commit
= xcalloc(1, sizeof(struct commit
));
49 commit
->util
= (void*)comment
;
51 commit
->object
.parsed
= 1;
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.
59 static int sha_eq(const unsigned char *a
, const unsigned char *b
)
63 return a
&& b
&& hashcmp(a
, b
) == 0;
69 RENAME_ONE_FILE_TO_ONE
,
70 RENAME_ONE_FILE_TO_TWO
,
71 RENAME_TWO_FILES_TO_ONE
74 struct rename_conflict_info
{
75 enum rename_type rename_type
;
76 struct diff_filepair
*pair1
;
77 struct diff_filepair
*pair2
;
80 struct stage_data
*dst_entry1
;
81 struct stage_data
*dst_entry2
;
82 struct diff_filespec ren1_other
;
83 struct diff_filespec ren2_other
;
87 * Since we want to write the index eventually, we cannot reuse the index
88 * for these (temporary) data.
93 unsigned char sha
[20];
95 struct rename_conflict_info
*rename_conflict_info
;
99 static inline void setup_rename_conflict_info(enum rename_type rename_type
,
100 struct diff_filepair
*pair1
,
101 struct diff_filepair
*pair2
,
104 struct stage_data
*dst_entry1
,
105 struct stage_data
*dst_entry2
,
106 struct merge_options
*o
,
107 struct stage_data
*src_entry1
,
108 struct stage_data
*src_entry2
)
110 struct rename_conflict_info
*ci
= xcalloc(1, sizeof(struct rename_conflict_info
));
111 ci
->rename_type
= rename_type
;
113 ci
->branch1
= branch1
;
114 ci
->branch2
= branch2
;
116 ci
->dst_entry1
= dst_entry1
;
117 dst_entry1
->rename_conflict_info
= ci
;
118 dst_entry1
->processed
= 0;
120 assert(!pair2
== !dst_entry2
);
122 ci
->dst_entry2
= dst_entry2
;
124 dst_entry2
->rename_conflict_info
= ci
;
127 if (rename_type
== RENAME_TWO_FILES_TO_ONE
) {
129 * For each rename, there could have been
130 * modifications on the side of history where that
131 * file was not renamed.
133 int ostage1
= o
->branch1
== branch1
? 3 : 2;
134 int ostage2
= ostage1
^ 1;
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
;
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
;
146 static int show(struct merge_options
*o
, int v
)
148 return (!o
->call_depth
&& o
->verbosity
>= v
) || o
->verbosity
>= 5;
151 static void flush_output(struct merge_options
*o
)
154 fputs(o
->obuf
.buf
, stdout
);
155 strbuf_reset(&o
->obuf
);
159 __attribute__((format (printf
, 3, 4)))
160 static void output(struct merge_options
*o
, int v
, const char *fmt
, ...)
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);
172 strbuf_vaddf(&o
->obuf
, fmt
, ap
);
175 strbuf_add(&o
->obuf
, "\n", 1);
176 if (!o
->buffer_output
)
180 static void output_commit_title(struct merge_options
*o
, struct commit
*commit
)
184 for (i
= o
->call_depth
; i
--;)
187 printf("virtual %s\n", (char *)commit
->util
);
189 printf("%s ", find_unique_abbrev(commit
->object
.sha1
, DEFAULT_ABBREV
));
190 if (parse_commit(commit
) != 0)
191 printf("(bad commit)\n");
194 int len
= find_commit_subject(commit
->buffer
, &title
);
196 printf("%.*s\n", len
, title
);
201 static int add_cacheinfo(unsigned int mode
, const unsigned char *sha1
,
202 const char *path
, int stage
, int refresh
, int options
)
204 struct cache_entry
*ce
;
205 ce
= make_cache_entry(mode
, sha1
? sha1
: null_sha1
, path
, stage
, refresh
);
207 return error("addinfo_cache failed for path '%s'", path
);
208 return add_cache_entry(ce
, options
);
211 static void init_tree_desc_from_tree(struct tree_desc
*desc
, struct tree
*tree
)
214 init_tree_desc(desc
, tree
->buffer
, tree
->size
);
217 static int git_merge_trees(int index_only
,
223 struct tree_desc t
[3];
224 struct unpack_trees_options opts
;
226 memset(&opts
, 0, sizeof(opts
));
233 opts
.fn
= threeway_merge
;
234 opts
.src_index
= &the_index
;
235 opts
.dst_index
= &the_index
;
236 setup_unpack_trees_porcelain(&opts
, "merge");
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
);
242 rc
= unpack_trees(3, t
, &opts
);
243 cache_tree_free(&active_cache_tree
);
247 struct tree
*write_tree_from_memory(struct merge_options
*o
)
249 struct tree
*result
= NULL
;
251 if (unmerged_cache()) {
253 fprintf(stderr
, "BUG: There are unmerged index entries:\n");
254 for (i
= 0; i
< active_nr
; i
++) {
255 struct cache_entry
*ce
= active_cache
[i
];
257 fprintf(stderr
, "BUG: %d %.*s\n", ce_stage(ce
),
258 (int)ce_namelen(ce
), ce
->name
);
260 die("Bug in merge-recursive.c");
263 if (!active_cache_tree
)
264 active_cache_tree
= cache_tree();
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");
271 result
= lookup_tree(active_cache_tree
->sha1
);
276 static 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
)
280 int len
= strlen(path
);
281 char *newpath
= xmalloc(baselen
+ len
+ 1);
282 struct merge_options
*o
= context
;
284 memcpy(newpath
, base
, baselen
);
285 memcpy(newpath
+ baselen
, path
, len
);
286 newpath
[baselen
+ len
] = '\0';
289 string_list_insert(&o
->current_directory_set
, newpath
);
291 string_list_insert(&o
->current_file_set
, newpath
);
294 return (S_ISDIR(mode
) ? READ_TREE_RECURSIVE
: 0);
297 static int get_files_dirs(struct merge_options
*o
, struct tree
*tree
)
300 if (read_tree_recursive(tree
, "", 0, 0, NULL
, save_files_dirs
, o
))
302 n
= o
->current_file_set
.nr
+ o
->current_directory_set
.nr
;
307 * Returns an index_entry instance which doesn't have to correspond to
308 * a real cache entry in Git's index.
310 static struct stage_data
*insert_stage_data(const char *path
,
311 struct tree
*o
, struct tree
*a
, struct tree
*b
,
312 struct string_list
*entries
)
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
);
322 item
= string_list_insert(entries
, path
);
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.
331 static struct string_list
*get_unmerged(void)
333 struct string_list
*unmerged
= xcalloc(1, sizeof(struct string_list
));
336 unmerged
->strdup_strings
= 1;
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
];
345 item
= string_list_lookup(unmerged
, ce
->name
);
347 item
= string_list_insert(unmerged
, ce
->name
);
348 item
->util
= xcalloc(1, sizeof(struct stage_data
));
351 e
->stages
[ce_stage(ce
)].mode
= ce
->ce_mode
;
352 hashcpy(e
->stages
[ce_stage(ce
)].sha
, ce
->sha1
);
358 static int string_list_df_name_compare(const void *a
, const void *b
)
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
);
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.
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.
376 int cmp
= df_name_compare(one
->string
, onelen
, S_IFDIR
,
377 two
->string
, twolen
, S_IFDIR
);
379 * Now that 'foo' and 'foo/bar' compare equal, we have to make sure
380 * that 'foo' comes before 'foo/bar'.
384 return onelen
- twolen
;
387 static void record_df_conflict_files(struct merge_options
*o
,
388 struct string_list
*entries
)
390 /* If there is a D/F conflict and the file for such a conflict
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.
403 const char *last_file
= NULL
;
408 * If we're merging merge-bases, we don't want to bother with
409 * any working directory changes.
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
);
418 string_list_clear(&o
->df_conflict_file_set
, 1);
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
;
425 * Check if last_file & path correspond to a D/F conflict;
426 * i.e. whether path is last_file+'/'+<something>.
427 * If so, record that it's okay to remove last_file to make
428 * room for path and friends if needed.
432 memcmp(path
, last_file
, last_len
) == 0 &&
433 path
[last_len
] == '/') {
434 string_list_insert(&o
->df_conflict_file_set
, last_file
);
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
443 if (S_ISREG(e
->stages
[2].mode
) || S_ISLNK(e
->stages
[2].mode
)) {
453 struct diff_filepair
*pair
;
454 struct stage_data
*src_entry
;
455 struct stage_data
*dst_entry
;
456 unsigned processed
:1;
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.
465 static struct string_list
*get_renames(struct merge_options
*o
,
470 struct string_list
*entries
)
473 struct string_list
*renames
;
474 struct diff_options opts
;
476 renames
= xcalloc(1, sizeof(struct string_list
));
478 DIFF_OPT_SET(&opts
, RECURSIVE
);
479 opts
.detect_rename
= DIFF_DETECT_RENAME
;
480 opts
.rename_limit
= o
->merge_rename_limit
>= 0 ? o
->merge_rename_limit
:
481 o
->diff_rename_limit
>= 0 ? o
->diff_rename_limit
:
483 opts
.rename_score
= o
->rename_score
;
484 opts
.show_rename_progress
= o
->show_rename_progress
;
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
);
490 if (opts
.needed_rename_limit
> o
->needed_rename_limit
)
491 o
->needed_rename_limit
= opts
.needed_rename_limit
;
492 for (i
= 0; i
< diff_queued_diff
.nr
; ++i
) {
493 struct string_list_item
*item
;
495 struct diff_filepair
*pair
= diff_queued_diff
.queue
[i
];
496 if (pair
->status
!= 'R') {
497 diff_free_filepair(pair
);
500 re
= xmalloc(sizeof(*re
));
503 item
= string_list_lookup(entries
, re
->pair
->one
->path
);
505 re
->src_entry
= insert_stage_data(re
->pair
->one
->path
,
506 o_tree
, a_tree
, b_tree
, entries
);
508 re
->src_entry
= item
->util
;
510 item
= string_list_lookup(entries
, re
->pair
->two
->path
);
512 re
->dst_entry
= insert_stage_data(re
->pair
->two
->path
,
513 o_tree
, a_tree
, b_tree
, entries
);
515 re
->dst_entry
= item
->util
;
516 item
= string_list_insert(renames
, pair
->one
->path
);
519 opts
.output_format
= DIFF_FORMAT_NO_OUTPUT
;
520 diff_queued_diff
.nr
= 0;
525 static int update_stages(const char *path
, const struct diff_filespec
*o
,
526 const struct diff_filespec
*a
,
527 const struct diff_filespec
*b
)
530 int options
= ADD_CACHE_OK_TO_ADD
| ADD_CACHE_SKIP_DFCHECK
;
532 if (remove_file_from_cache(path
))
535 if (add_cacheinfo(o
->mode
, o
->sha1
, path
, 1, 0, options
))
538 if (add_cacheinfo(a
->mode
, a
->sha1
, path
, 2, 0, options
))
541 if (add_cacheinfo(b
->mode
, b
->sha1
, path
, 3, 0, options
))
546 static void update_entry(struct stage_data
*entry
,
547 struct diff_filespec
*o
,
548 struct diff_filespec
*a
,
549 struct diff_filespec
*b
)
551 entry
->processed
= 0;
552 entry
->stages
[1].mode
= o
->mode
;
553 entry
->stages
[2].mode
= a
->mode
;
554 entry
->stages
[3].mode
= b
->mode
;
555 hashcpy(entry
->stages
[1].sha
, o
->sha1
);
556 hashcpy(entry
->stages
[2].sha
, a
->sha1
);
557 hashcpy(entry
->stages
[3].sha
, b
->sha1
);
560 static int remove_file(struct merge_options
*o
, int clean
,
561 const char *path
, int no_wd
)
563 int update_cache
= o
->call_depth
|| clean
;
564 int update_working_directory
= !o
->call_depth
&& !no_wd
;
567 if (remove_file_from_cache(path
))
570 if (update_working_directory
) {
571 if (remove_path(path
))
577 static char *unique_path(struct merge_options
*o
, const char *path
, const char *branch
)
579 char *newpath
= xmalloc(strlen(path
) + 1 + strlen(branch
) + 8 + 1);
582 char *p
= newpath
+ strlen(path
);
583 strcpy(newpath
, path
);
589 while (string_list_has_string(&o
->current_file_set
, newpath
) ||
590 string_list_has_string(&o
->current_directory_set
, newpath
) ||
591 lstat(newpath
, &st
) == 0)
592 sprintf(p
, "_%d", suffix
++);
594 string_list_insert(&o
->current_file_set
, newpath
);
598 static void flush_buffer(int fd
, const char *buf
, unsigned long size
)
601 long ret
= write_in_full(fd
, buf
, size
);
606 die_errno("merge-recursive");
608 die("merge-recursive: disk full?");
615 static int dir_in_way(const char *path
, int check_working_copy
)
617 int pos
, pathlen
= strlen(path
);
618 char *dirpath
= xmalloc(pathlen
+ 2);
621 strcpy(dirpath
, path
);
622 dirpath
[pathlen
] = '/';
623 dirpath
[pathlen
+1] = '\0';
625 pos
= cache_name_pos(dirpath
, pathlen
+1);
629 if (pos
< active_nr
&&
630 !strncmp(dirpath
, active_cache
[pos
]->name
, pathlen
+1)) {
636 return check_working_copy
&& !lstat(path
, &st
) && S_ISDIR(st
.st_mode
);
639 static int was_tracked(const char *path
)
641 int pos
= cache_name_pos(path
, strlen(path
));
645 while (pos
< active_nr
&&
646 !strcmp(path
, active_cache
[pos
]->name
)) {
648 * If stage #0, it is definitely tracked.
649 * If it has stage #2 then it was tracked
650 * before this merge started. All other
651 * cases the path was not tracked.
653 switch (ce_stage(active_cache
[pos
])) {
663 static int would_lose_untracked(const char *path
)
665 return !was_tracked(path
) && file_exists(path
);
668 static int make_room_for_path(struct merge_options
*o
, const char *path
)
671 const char *msg
= "failed to create path '%s'%s";
673 /* Unlink any D/F conflict files that are in the way */
674 for (i
= 0; i
< o
->df_conflict_file_set
.nr
; i
++) {
675 const char *df_path
= o
->df_conflict_file_set
.items
[i
].string
;
676 size_t pathlen
= strlen(path
);
677 size_t df_pathlen
= strlen(df_path
);
678 if (df_pathlen
< pathlen
&&
679 path
[df_pathlen
] == '/' &&
680 strncmp(path
, df_path
, df_pathlen
) == 0) {
682 "Removing %s to make room for subdirectory\n",
685 unsorted_string_list_delete_item(&o
->df_conflict_file_set
,
691 /* Make sure leading directories are created */
692 status
= safe_create_leading_directories_const(path
);
695 /* something else exists */
696 error(msg
, path
, ": perhaps a D/F conflict?");
703 * Do not unlink a file in the work tree if we are not
706 if (would_lose_untracked(path
))
707 return error("refusing to lose untracked file at '%s'",
710 /* Successful unlink is good.. */
713 /* .. and so is no existing file */
716 /* .. but not some other error (who really cares what?) */
717 return error(msg
, path
, ": perhaps a D/F conflict?");
720 static void update_file_flags(struct merge_options
*o
,
721 const unsigned char *sha
,
731 enum object_type type
;
735 if (S_ISGITLINK(mode
)) {
737 * We may later decide to recursively descend into
738 * the submodule directory and update its index
739 * and/or work tree, but we do not do that now.
745 buf
= read_sha1_file(sha
, &type
, &size
);
747 die("cannot read object %s '%s'", sha1_to_hex(sha
), path
);
748 if (type
!= OBJ_BLOB
)
749 die("blob expected for %s '%s'", sha1_to_hex(sha
), path
);
751 struct strbuf strbuf
= STRBUF_INIT
;
752 if (convert_to_working_tree(path
, buf
, size
, &strbuf
)) {
755 buf
= strbuf_detach(&strbuf
, NULL
);
759 if (make_room_for_path(o
, path
) < 0) {
764 if (S_ISREG(mode
) || (!has_symlinks
&& S_ISLNK(mode
))) {
770 fd
= open(path
, O_WRONLY
| O_TRUNC
| O_CREAT
, mode
);
772 die_errno("failed to open '%s'", path
);
773 flush_buffer(fd
, buf
, size
);
775 } else if (S_ISLNK(mode
)) {
776 char *lnk
= xmemdupz(buf
, size
);
777 safe_create_leading_directories_const(path
);
779 if (symlink(lnk
, path
))
780 die_errno("failed to symlink '%s'", path
);
783 die("do not know what to do with %06o %s '%s'",
784 mode
, sha1_to_hex(sha
), path
);
789 add_cacheinfo(mode
, sha
, path
, 0, update_wd
, ADD_CACHE_OK_TO_ADD
);
792 static void update_file(struct merge_options
*o
,
794 const unsigned char *sha
,
798 update_file_flags(o
, sha
, mode
, path
, o
->call_depth
|| clean
, !o
->call_depth
);
801 /* Low level file merging, update and removal */
803 struct merge_file_info
{
804 unsigned char sha
[20];
810 static int merge_3way(struct merge_options
*o
,
811 mmbuffer_t
*result_buf
,
812 const struct diff_filespec
*one
,
813 const struct diff_filespec
*a
,
814 const struct diff_filespec
*b
,
818 mmfile_t orig
, src1
, src2
;
819 struct ll_merge_options ll_opts
= {0};
820 char *base_name
, *name1
, *name2
;
823 ll_opts
.renormalize
= o
->renormalize
;
824 ll_opts
.xdl_opts
= o
->xdl_opts
;
827 ll_opts
.virtual_ancestor
= 1;
830 switch (o
->recursive_variant
) {
831 case MERGE_RECURSIVE_OURS
:
832 ll_opts
.variant
= XDL_MERGE_FAVOR_OURS
;
834 case MERGE_RECURSIVE_THEIRS
:
835 ll_opts
.variant
= XDL_MERGE_FAVOR_THEIRS
;
843 if (strcmp(a
->path
, b
->path
) ||
844 (o
->ancestor
!= NULL
&& strcmp(a
->path
, one
->path
) != 0)) {
845 base_name
= o
->ancestor
== NULL
? NULL
:
846 xstrdup(mkpath("%s:%s", o
->ancestor
, one
->path
));
847 name1
= xstrdup(mkpath("%s:%s", branch1
, a
->path
));
848 name2
= xstrdup(mkpath("%s:%s", branch2
, b
->path
));
850 base_name
= o
->ancestor
== NULL
? NULL
:
851 xstrdup(mkpath("%s", o
->ancestor
));
852 name1
= xstrdup(mkpath("%s", branch1
));
853 name2
= xstrdup(mkpath("%s", branch2
));
856 read_mmblob(&orig
, one
->sha1
);
857 read_mmblob(&src1
, a
->sha1
);
858 read_mmblob(&src2
, b
->sha1
);
860 merge_status
= ll_merge(result_buf
, a
->path
, &orig
, base_name
,
861 &src1
, name1
, &src2
, name2
, &ll_opts
);
871 static struct merge_file_info
merge_file_1(struct merge_options
*o
,
872 const struct diff_filespec
*one
,
873 const struct diff_filespec
*a
,
874 const struct diff_filespec
*b
,
878 struct merge_file_info result
;
882 if ((S_IFMT
& a
->mode
) != (S_IFMT
& b
->mode
)) {
884 if (S_ISREG(a
->mode
)) {
885 result
.mode
= a
->mode
;
886 hashcpy(result
.sha
, a
->sha1
);
888 result
.mode
= b
->mode
;
889 hashcpy(result
.sha
, b
->sha1
);
892 if (!sha_eq(a
->sha1
, one
->sha1
) && !sha_eq(b
->sha1
, one
->sha1
))
898 if (a
->mode
== b
->mode
|| a
->mode
== one
->mode
)
899 result
.mode
= b
->mode
;
901 result
.mode
= a
->mode
;
902 if (b
->mode
!= one
->mode
) {
908 if (sha_eq(a
->sha1
, b
->sha1
) || sha_eq(a
->sha1
, one
->sha1
))
909 hashcpy(result
.sha
, b
->sha1
);
910 else if (sha_eq(b
->sha1
, one
->sha1
))
911 hashcpy(result
.sha
, a
->sha1
);
912 else if (S_ISREG(a
->mode
)) {
913 mmbuffer_t result_buf
;
916 merge_status
= merge_3way(o
, &result_buf
, one
, a
, b
,
919 if ((merge_status
< 0) || !result_buf
.ptr
)
920 die("Failed to execute internal merge");
922 if (write_sha1_file(result_buf
.ptr
, result_buf
.size
,
923 blob_type
, result
.sha
))
924 die("Unable to add %s to database",
927 free(result_buf
.ptr
);
928 result
.clean
= (merge_status
== 0);
929 } else if (S_ISGITLINK(a
->mode
)) {
930 result
.clean
= merge_submodule(result
.sha
, one
->path
, one
->sha1
,
932 } else if (S_ISLNK(a
->mode
)) {
933 hashcpy(result
.sha
, a
->sha1
);
935 if (!sha_eq(a
->sha1
, b
->sha1
))
938 die("unsupported object type in the tree");
945 static struct merge_file_info
946 merge_file_special_markers(struct merge_options
*o
,
947 const struct diff_filespec
*one
,
948 const struct diff_filespec
*a
,
949 const struct diff_filespec
*b
,
951 const char *filename1
,
953 const char *filename2
)
957 struct merge_file_info mfi
;
960 side1
= xmalloc(strlen(branch1
) + strlen(filename1
) + 2);
961 sprintf(side1
, "%s:%s", branch1
, filename1
);
964 side2
= xmalloc(strlen(branch2
) + strlen(filename2
) + 2);
965 sprintf(side2
, "%s:%s", branch2
, filename2
);
968 mfi
= merge_file_1(o
, one
, a
, b
,
969 side1
? side1
: branch1
, side2
? side2
: branch2
);
975 static struct merge_file_info
merge_file(struct merge_options
*o
,
977 const unsigned char *o_sha
, int o_mode
,
978 const unsigned char *a_sha
, int a_mode
,
979 const unsigned char *b_sha
, int b_mode
,
983 struct diff_filespec one
, a
, b
;
985 one
.path
= a
.path
= b
.path
= (char *)path
;
986 hashcpy(one
.sha1
, o_sha
);
988 hashcpy(a
.sha1
, a_sha
);
990 hashcpy(b
.sha1
, b_sha
);
992 return merge_file_1(o
, &one
, &a
, &b
, branch1
, branch2
);
995 static void conflict_rename_delete(struct merge_options
*o
,
996 struct diff_filepair
*pair
,
997 const char *rename_branch
,
998 const char *other_branch
)
1000 char *dest_name
= pair
->two
->path
;
1001 int df_conflict
= 0;
1003 output(o
, 1, "CONFLICT (rename/delete): Rename %s->%s in %s "
1004 "and deleted in %s",
1005 pair
->one
->path
, pair
->two
->path
, rename_branch
,
1008 update_stages(dest_name
, NULL
,
1009 rename_branch
== o
->branch1
? pair
->two
: NULL
,
1010 rename_branch
== o
->branch1
? NULL
: pair
->two
);
1011 if (dir_in_way(dest_name
, !o
->call_depth
)) {
1012 dest_name
= unique_path(o
, dest_name
, rename_branch
);
1015 update_file(o
, 0, pair
->two
->sha1
, pair
->two
->mode
, dest_name
);
1020 static void conflict_rename_rename_1to2(struct merge_options
*o
,
1021 struct rename_conflict_info
*ci
)
1023 /* One file was renamed in both branches, but to different names. */
1024 struct diff_filespec
*one
= ci
->pair1
->one
;
1025 struct diff_filespec
*a
= ci
->pair1
->two
;
1026 struct diff_filespec
*b
= ci
->pair2
->two
;
1027 const char *dst_name_a
= a
->path
;
1028 const char *dst_name_b
= b
->path
;
1032 output(o
, 1, "CONFLICT (rename/rename): "
1033 "Rename \"%s\"->\"%s\" in branch \"%s\" "
1034 "rename \"%s\"->\"%s\" in \"%s\"%s",
1035 one
->path
, a
->path
, ci
->branch1
,
1036 one
->path
, b
->path
, ci
->branch2
,
1037 o
->call_depth
? " (left unresolved)" : "");
1038 if (dir_in_way(a
->path
, !o
->call_depth
)) {
1039 dst_name_a
= del
[delp
++] = unique_path(o
, a
->path
, ci
->branch1
);
1040 output(o
, 1, "%s is a directory in %s adding as %s instead",
1041 a
->path
, ci
->branch2
, dst_name_a
);
1043 if (dir_in_way(b
->path
, !o
->call_depth
)) {
1044 dst_name_b
= del
[delp
++] = unique_path(o
, b
->path
, ci
->branch2
);
1045 output(o
, 1, "%s is a directory in %s adding as %s instead",
1046 b
->path
, ci
->branch1
, dst_name_b
);
1048 if (o
->call_depth
) {
1049 struct merge_file_info mfi
;
1050 mfi
= merge_file(o
, one
->path
,
1051 one
->sha1
, one
->mode
,
1054 ci
->branch1
, ci
->branch2
);
1056 * FIXME: For rename/add-source conflicts (if we could detect
1057 * such), this is wrong. We should instead find a unique
1058 * pathname and then either rename the add-source file to that
1059 * unique path, or use that unique path instead of src here.
1061 update_file(o
, 0, mfi
.sha
, mfi
.mode
, one
->path
);
1062 remove_file_from_cache(a
->path
);
1063 remove_file_from_cache(b
->path
);
1065 update_stages(a
->path
, NULL
, a
, NULL
);
1066 update_stages(b
->path
, NULL
, NULL
, b
);
1068 update_file(o
, 0, a
->sha1
, a
->mode
, dst_name_a
);
1069 update_file(o
, 0, b
->sha1
, b
->mode
, dst_name_b
);
1075 static void conflict_rename_rename_2to1(struct merge_options
*o
,
1076 struct rename_conflict_info
*ci
)
1078 /* Two files, a & b, were renamed to the same thing, c. */
1079 struct diff_filespec
*a
= ci
->pair1
->one
;
1080 struct diff_filespec
*b
= ci
->pair2
->one
;
1081 struct diff_filespec
*c1
= ci
->pair1
->two
;
1082 struct diff_filespec
*c2
= ci
->pair2
->two
;
1083 char *path
= c1
->path
; /* == c2->path */
1084 struct merge_file_info mfi_c1
;
1085 struct merge_file_info mfi_c2
;
1087 output(o
, 1, "CONFLICT (rename/rename): "
1088 "Rename %s->%s in %s. "
1089 "Rename %s->%s in %s",
1090 a
->path
, c1
->path
, ci
->branch1
,
1091 b
->path
, c2
->path
, ci
->branch2
);
1093 remove_file(o
, 1, a
->path
, would_lose_untracked(a
->path
));
1094 remove_file(o
, 1, b
->path
, would_lose_untracked(b
->path
));
1096 mfi_c1
= merge_file_special_markers(o
, a
, c1
, &ci
->ren1_other
,
1097 o
->branch1
, c1
->path
,
1098 o
->branch2
, ci
->ren1_other
.path
);
1099 mfi_c2
= merge_file_special_markers(o
, b
, &ci
->ren2_other
, c2
,
1100 o
->branch1
, ci
->ren2_other
.path
,
1101 o
->branch2
, c2
->path
);
1103 if (o
->call_depth
) {
1105 * If mfi_c1.clean && mfi_c2.clean, then it might make
1106 * sense to do a two-way merge of those results. But, I
1107 * think in all cases, it makes sense to have the virtual
1108 * merge base just undo the renames; they can be detected
1109 * again later for the non-recursive merge.
1111 remove_file(o
, 0, path
, 0);
1112 update_file(o
, 0, mfi_c1
.sha
, mfi_c1
.mode
, a
->path
);
1113 update_file(o
, 0, mfi_c2
.sha
, mfi_c2
.mode
, b
->path
);
1115 char *new_path1
= unique_path(o
, path
, ci
->branch1
);
1116 char *new_path2
= unique_path(o
, path
, ci
->branch2
);
1117 output(o
, 1, "Renaming %s to %s and %s to %s instead",
1118 a
->path
, new_path1
, b
->path
, new_path2
);
1119 remove_file(o
, 0, path
, 0);
1120 update_file(o
, 0, mfi_c1
.sha
, mfi_c1
.mode
, new_path1
);
1121 update_file(o
, 0, mfi_c2
.sha
, mfi_c2
.mode
, new_path2
);
1127 static int process_renames(struct merge_options
*o
,
1128 struct string_list
*a_renames
,
1129 struct string_list
*b_renames
)
1131 int clean_merge
= 1, i
, j
;
1132 struct string_list a_by_dst
= STRING_LIST_INIT_NODUP
;
1133 struct string_list b_by_dst
= STRING_LIST_INIT_NODUP
;
1134 const struct rename
*sre
;
1136 for (i
= 0; i
< a_renames
->nr
; i
++) {
1137 sre
= a_renames
->items
[i
].util
;
1138 string_list_insert(&a_by_dst
, sre
->pair
->two
->path
)->util
1141 for (i
= 0; i
< b_renames
->nr
; i
++) {
1142 sre
= b_renames
->items
[i
].util
;
1143 string_list_insert(&b_by_dst
, sre
->pair
->two
->path
)->util
1147 for (i
= 0, j
= 0; i
< a_renames
->nr
|| j
< b_renames
->nr
;) {
1148 struct string_list
*renames1
, *renames2Dst
;
1149 struct rename
*ren1
= NULL
, *ren2
= NULL
;
1150 const char *branch1
, *branch2
;
1151 const char *ren1_src
, *ren1_dst
;
1152 struct string_list_item
*lookup
;
1154 if (i
>= a_renames
->nr
) {
1155 ren2
= b_renames
->items
[j
++].util
;
1156 } else if (j
>= b_renames
->nr
) {
1157 ren1
= a_renames
->items
[i
++].util
;
1159 int compare
= strcmp(a_renames
->items
[i
].string
,
1160 b_renames
->items
[j
].string
);
1162 ren1
= a_renames
->items
[i
++].util
;
1164 ren2
= b_renames
->items
[j
++].util
;
1167 /* TODO: refactor, so that 1/2 are not needed */
1169 renames1
= a_renames
;
1170 renames2Dst
= &b_by_dst
;
1171 branch1
= o
->branch1
;
1172 branch2
= o
->branch2
;
1175 renames1
= b_renames
;
1176 renames2Dst
= &a_by_dst
;
1177 branch1
= o
->branch2
;
1178 branch2
= o
->branch1
;
1184 if (ren1
->processed
)
1186 ren1
->processed
= 1;
1187 ren1
->dst_entry
->processed
= 1;
1188 /* BUG: We should only mark src_entry as processed if we
1189 * are not dealing with a rename + add-source case.
1191 ren1
->src_entry
->processed
= 1;
1193 ren1_src
= ren1
->pair
->one
->path
;
1194 ren1_dst
= ren1
->pair
->two
->path
;
1197 /* One file renamed on both sides */
1198 const char *ren2_src
= ren2
->pair
->one
->path
;
1199 const char *ren2_dst
= ren2
->pair
->two
->path
;
1200 enum rename_type rename_type
;
1201 if (strcmp(ren1_src
, ren2_src
) != 0)
1202 die("ren1_src != ren2_src");
1203 ren2
->dst_entry
->processed
= 1;
1204 ren2
->processed
= 1;
1205 if (strcmp(ren1_dst
, ren2_dst
) != 0) {
1206 rename_type
= RENAME_ONE_FILE_TO_TWO
;
1209 rename_type
= RENAME_ONE_FILE_TO_ONE
;
1210 /* BUG: We should only remove ren1_src in
1211 * the base stage (think of rename +
1212 * add-source cases).
1214 remove_file(o
, 1, ren1_src
, 1);
1215 update_entry(ren1
->dst_entry
,
1220 setup_rename_conflict_info(rename_type
,
1230 } else if ((lookup
= string_list_lookup(renames2Dst
, ren1_dst
))) {
1231 /* Two different files renamed to the same thing */
1233 ren2
= lookup
->util
;
1234 ren2_dst
= ren2
->pair
->two
->path
;
1235 if (strcmp(ren1_dst
, ren2_dst
) != 0)
1236 die("ren1_dst != ren2_dst");
1239 ren2
->processed
= 1;
1241 * BUG: We should only mark src_entry as processed
1242 * if we are not dealing with a rename + add-source
1245 ren2
->src_entry
->processed
= 1;
1247 setup_rename_conflict_info(RENAME_TWO_FILES_TO_ONE
,
1259 /* Renamed in 1, maybe changed in 2 */
1260 /* we only use sha1 and mode of these */
1261 struct diff_filespec src_other
, dst_other
;
1265 * unpack_trees loads entries from common-commit
1266 * into stage 1, from head-commit into stage 2, and
1267 * from merge-commit into stage 3. We keep track
1268 * of which side corresponds to the rename.
1270 int renamed_stage
= a_renames
== renames1
? 2 : 3;
1271 int other_stage
= a_renames
== renames1
? 3 : 2;
1273 /* BUG: We should only remove ren1_src in the base
1274 * stage and in other_stage (think of rename +
1277 remove_file(o
, 1, ren1_src
,
1278 renamed_stage
== 2 || !was_tracked(ren1_src
));
1280 hashcpy(src_other
.sha1
, ren1
->src_entry
->stages
[other_stage
].sha
);
1281 src_other
.mode
= ren1
->src_entry
->stages
[other_stage
].mode
;
1282 hashcpy(dst_other
.sha1
, ren1
->dst_entry
->stages
[other_stage
].sha
);
1283 dst_other
.mode
= ren1
->dst_entry
->stages
[other_stage
].mode
;
1286 if (sha_eq(src_other
.sha1
, null_sha1
)) {
1287 setup_rename_conflict_info(RENAME_DELETE
,
1297 } else if ((dst_other
.mode
== ren1
->pair
->two
->mode
) &&
1298 sha_eq(dst_other
.sha1
, ren1
->pair
->two
->sha1
)) {
1299 /* Added file on the other side
1300 identical to the file being
1301 renamed: clean merge */
1302 update_file(o
, 1, ren1
->pair
->two
->sha1
, ren1
->pair
->two
->mode
, ren1_dst
);
1303 } else if (!sha_eq(dst_other
.sha1
, null_sha1
)) {
1306 output(o
, 1, "CONFLICT (rename/add): Rename %s->%s in %s. "
1308 ren1_src
, ren1_dst
, branch1
,
1310 if (o
->call_depth
) {
1311 struct merge_file_info mfi
;
1312 mfi
= merge_file(o
, ren1_dst
, null_sha1
, 0,
1313 ren1
->pair
->two
->sha1
, ren1
->pair
->two
->mode
,
1314 dst_other
.sha1
, dst_other
.mode
,
1316 output(o
, 1, "Adding merged %s", ren1_dst
);
1317 update_file(o
, 0, mfi
.sha
, mfi
.mode
, ren1_dst
);
1320 char *new_path
= unique_path(o
, ren1_dst
, branch2
);
1321 output(o
, 1, "Adding as %s instead", new_path
);
1322 update_file(o
, 0, dst_other
.sha1
, dst_other
.mode
, new_path
);
1329 struct diff_filespec
*one
, *a
, *b
;
1330 src_other
.path
= (char *)ren1_src
;
1332 one
= ren1
->pair
->one
;
1333 if (a_renames
== renames1
) {
1334 a
= ren1
->pair
->two
;
1337 b
= ren1
->pair
->two
;
1340 update_entry(ren1
->dst_entry
, one
, a
, b
);
1341 setup_rename_conflict_info(RENAME_NORMAL
,
1354 string_list_clear(&a_by_dst
, 0);
1355 string_list_clear(&b_by_dst
, 0);
1360 static unsigned char *stage_sha(const unsigned char *sha
, unsigned mode
)
1362 return (is_null_sha1(sha
) || mode
== 0) ? NULL
: (unsigned char *)sha
;
1365 static int read_sha1_strbuf(const unsigned char *sha1
, struct strbuf
*dst
)
1368 enum object_type type
;
1370 buf
= read_sha1_file(sha1
, &type
, &size
);
1372 return error("cannot read object %s", sha1_to_hex(sha1
));
1373 if (type
!= OBJ_BLOB
) {
1375 return error("object %s is not a blob", sha1_to_hex(sha1
));
1377 strbuf_attach(dst
, buf
, size
, size
+ 1);
1381 static int blob_unchanged(const unsigned char *o_sha
,
1382 const unsigned char *a_sha
,
1383 int renormalize
, const char *path
)
1385 struct strbuf o
= STRBUF_INIT
;
1386 struct strbuf a
= STRBUF_INIT
;
1387 int ret
= 0; /* assume changed for safety */
1389 if (sha_eq(o_sha
, a_sha
))
1394 assert(o_sha
&& a_sha
);
1395 if (read_sha1_strbuf(o_sha
, &o
) || read_sha1_strbuf(a_sha
, &a
))
1398 * Note: binary | is used so that both renormalizations are
1399 * performed. Comparison can be skipped if both files are
1400 * unchanged since their sha1s have already been compared.
1402 if (renormalize_buffer(path
, o
.buf
, o
.len
, &o
) |
1403 renormalize_buffer(path
, a
.buf
, o
.len
, &a
))
1404 ret
= (o
.len
== a
.len
&& !memcmp(o
.buf
, a
.buf
, o
.len
));
1412 static void handle_delete_modify(struct merge_options
*o
,
1414 unsigned char *o_sha
, int o_mode
,
1415 unsigned char *a_sha
, int a_mode
,
1416 unsigned char *b_sha
, int b_mode
)
1418 char *renamed
= NULL
;
1419 if (dir_in_way(path
, !o
->call_depth
)) {
1420 renamed
= unique_path(o
, path
, a_sha
? o
->branch1
: o
->branch2
);
1423 if (o
->call_depth
) {
1425 * We cannot arbitrarily accept either a_sha or b_sha as
1426 * correct; since there is no true "middle point" between
1427 * them, simply reuse the base version for virtual merge base.
1429 remove_file_from_cache(path
);
1430 update_file(o
, 0, o_sha
, o_mode
, renamed
? renamed
: path
);
1431 } else if (!a_sha
) {
1432 output(o
, 1, "CONFLICT (delete/modify): %s deleted in %s "
1433 "and modified in %s. Version %s of %s left in tree%s%s.",
1435 o
->branch2
, o
->branch2
, path
,
1436 NULL
== renamed
? "" : " at ",
1437 NULL
== renamed
? "" : renamed
);
1438 update_file(o
, 0, b_sha
, b_mode
, renamed
? renamed
: path
);
1440 output(o
, 1, "CONFLICT (delete/modify): %s deleted in %s "
1441 "and modified in %s. Version %s of %s left in tree%s%s.",
1443 o
->branch1
, o
->branch1
, path
,
1444 NULL
== renamed
? "" : " at ",
1445 NULL
== renamed
? "" : renamed
);
1446 update_file(o
, 0, a_sha
, a_mode
, renamed
? renamed
: path
);
1452 static int merge_content(struct merge_options
*o
,
1454 unsigned char *o_sha
, int o_mode
,
1455 unsigned char *a_sha
, int a_mode
,
1456 unsigned char *b_sha
, int b_mode
,
1457 struct rename_conflict_info
*rename_conflict_info
)
1459 const char *reason
= "content";
1460 const char *path1
= NULL
, *path2
= NULL
;
1461 struct merge_file_info mfi
;
1462 struct diff_filespec one
, a
, b
;
1463 unsigned df_conflict_remains
= 0;
1467 o_sha
= (unsigned char *)null_sha1
;
1469 one
.path
= a
.path
= b
.path
= (char *)path
;
1470 hashcpy(one
.sha1
, o_sha
);
1472 hashcpy(a
.sha1
, a_sha
);
1474 hashcpy(b
.sha1
, b_sha
);
1477 if (rename_conflict_info
) {
1478 struct diff_filepair
*pair1
= rename_conflict_info
->pair1
;
1480 path1
= (o
->branch1
== rename_conflict_info
->branch1
) ?
1481 pair1
->two
->path
: pair1
->one
->path
;
1482 /* If rename_conflict_info->pair2 != NULL, we are in
1483 * RENAME_ONE_FILE_TO_ONE case. Otherwise, we have a
1486 path2
= (rename_conflict_info
->pair2
||
1487 o
->branch2
== rename_conflict_info
->branch1
) ?
1488 pair1
->two
->path
: pair1
->one
->path
;
1490 if (dir_in_way(path
, !o
->call_depth
))
1491 df_conflict_remains
= 1;
1493 mfi
= merge_file_special_markers(o
, &one
, &a
, &b
,
1497 if (mfi
.clean
&& !df_conflict_remains
&&
1498 sha_eq(mfi
.sha
, a_sha
) && mfi
.mode
== a_mode
) {
1499 int path_renamed_outside_HEAD
;
1500 output(o
, 3, "Skipped %s (merged same as existing)", path
);
1502 * The content merge resulted in the same file contents we
1503 * already had. We can return early if those file contents
1504 * are recorded at the correct path (which may not be true
1505 * if the merge involves a rename).
1507 path_renamed_outside_HEAD
= !path2
|| !strcmp(path
, path2
);
1508 if (!path_renamed_outside_HEAD
) {
1509 add_cacheinfo(mfi
.mode
, mfi
.sha
, path
,
1510 0 /*stage*/, 1 /*refresh*/, 0 /*options*/);
1514 output(o
, 2, "Auto-merging %s", path
);
1517 if (S_ISGITLINK(mfi
.mode
))
1518 reason
= "submodule";
1519 output(o
, 1, "CONFLICT (%s): Merge conflict in %s",
1521 if (rename_conflict_info
&& !df_conflict_remains
)
1522 update_stages(path
, &one
, &a
, &b
);
1525 if (df_conflict_remains
) {
1527 if (o
->call_depth
) {
1528 remove_file_from_cache(path
);
1531 update_stages(path
, &one
, &a
, &b
);
1533 int file_from_stage2
= was_tracked(path
);
1534 struct diff_filespec merged
;
1535 hashcpy(merged
.sha1
, mfi
.sha
);
1536 merged
.mode
= mfi
.mode
;
1538 update_stages(path
, NULL
,
1539 file_from_stage2
? &merged
: NULL
,
1540 file_from_stage2
? NULL
: &merged
);
1544 new_path
= unique_path(o
, path
, rename_conflict_info
->branch1
);
1545 output(o
, 1, "Adding as %s instead", new_path
);
1546 update_file(o
, 0, mfi
.sha
, mfi
.mode
, new_path
);
1550 update_file(o
, mfi
.clean
, mfi
.sha
, mfi
.mode
, path
);
1556 /* Per entry merge function */
1557 static int process_entry(struct merge_options
*o
,
1558 const char *path
, struct stage_data
*entry
)
1561 printf("processing entry, clean cache: %s\n", index_only ? "yes": "no");
1562 print_index_entry("\tpath: ", entry);
1564 int clean_merge
= 1;
1565 int normalize
= o
->renormalize
;
1566 unsigned o_mode
= entry
->stages
[1].mode
;
1567 unsigned a_mode
= entry
->stages
[2].mode
;
1568 unsigned b_mode
= entry
->stages
[3].mode
;
1569 unsigned char *o_sha
= stage_sha(entry
->stages
[1].sha
, o_mode
);
1570 unsigned char *a_sha
= stage_sha(entry
->stages
[2].sha
, a_mode
);
1571 unsigned char *b_sha
= stage_sha(entry
->stages
[3].sha
, b_mode
);
1573 entry
->processed
= 1;
1574 if (entry
->rename_conflict_info
) {
1575 struct rename_conflict_info
*conflict_info
= entry
->rename_conflict_info
;
1576 switch (conflict_info
->rename_type
) {
1578 case RENAME_ONE_FILE_TO_ONE
:
1579 clean_merge
= merge_content(o
, path
,
1580 o_sha
, o_mode
, a_sha
, a_mode
, b_sha
, b_mode
,
1585 conflict_rename_delete(o
, conflict_info
->pair1
,
1586 conflict_info
->branch1
,
1587 conflict_info
->branch2
);
1589 case RENAME_ONE_FILE_TO_TWO
:
1591 conflict_rename_rename_1to2(o
, conflict_info
);
1593 case RENAME_TWO_FILES_TO_ONE
:
1595 conflict_rename_rename_2to1(o
, conflict_info
);
1598 entry
->processed
= 0;
1601 } else if (o_sha
&& (!a_sha
|| !b_sha
)) {
1602 /* Case A: Deleted in one */
1603 if ((!a_sha
&& !b_sha
) ||
1604 (!b_sha
&& blob_unchanged(o_sha
, a_sha
, normalize
, path
)) ||
1605 (!a_sha
&& blob_unchanged(o_sha
, b_sha
, normalize
, path
))) {
1606 /* Deleted in both or deleted in one and
1607 * unchanged in the other */
1609 output(o
, 2, "Removing %s", path
);
1610 /* do not touch working file if it did not exist */
1611 remove_file(o
, 1, path
, !a_sha
);
1613 /* Modify/delete; deleted side may have put a directory in the way */
1615 handle_delete_modify(o
, path
, o_sha
, o_mode
,
1616 a_sha
, a_mode
, b_sha
, b_mode
);
1618 } else if ((!o_sha
&& a_sha
&& !b_sha
) ||
1619 (!o_sha
&& !a_sha
&& b_sha
)) {
1620 /* Case B: Added in one. */
1621 /* [nothing|directory] -> ([nothing|directory], file) */
1623 const char *add_branch
;
1624 const char *other_branch
;
1626 const unsigned char *sha
;
1630 add_branch
= o
->branch1
;
1631 other_branch
= o
->branch2
;
1634 conf
= "file/directory";
1636 add_branch
= o
->branch2
;
1637 other_branch
= o
->branch1
;
1640 conf
= "directory/file";
1642 if (dir_in_way(path
, !o
->call_depth
)) {
1643 char *new_path
= unique_path(o
, path
, add_branch
);
1645 output(o
, 1, "CONFLICT (%s): There is a directory with name %s in %s. "
1647 conf
, path
, other_branch
, path
, new_path
);
1649 remove_file_from_cache(path
);
1650 update_file(o
, 0, sha
, mode
, new_path
);
1652 remove_file_from_cache(path
);
1655 output(o
, 2, "Adding %s", path
);
1656 update_file(o
, 1, sha
, mode
, path
);
1658 } else if (a_sha
&& b_sha
) {
1659 /* Case C: Added in both (check for same permissions) and */
1660 /* case D: Modified in both, but differently. */
1661 clean_merge
= merge_content(o
, path
,
1662 o_sha
, o_mode
, a_sha
, a_mode
, b_sha
, b_mode
,
1664 } else if (!o_sha
&& !a_sha
&& !b_sha
) {
1666 * this entry was deleted altogether. a_mode == 0 means
1667 * we had that path and want to actively remove it.
1669 remove_file(o
, 1, path
, !a_mode
);
1671 die("Fatal merge failure, shouldn't happen.");
1676 int merge_trees(struct merge_options
*o
,
1679 struct tree
*common
,
1680 struct tree
**result
)
1684 if (o
->subtree_shift
) {
1685 merge
= shift_tree_object(head
, merge
, o
->subtree_shift
);
1686 common
= shift_tree_object(head
, common
, o
->subtree_shift
);
1689 if (sha_eq(common
->object
.sha1
, merge
->object
.sha1
)) {
1690 output(o
, 0, "Already up-to-date!");
1695 code
= git_merge_trees(o
->call_depth
, common
, head
, merge
);
1698 if (show(o
, 4) || o
->call_depth
)
1699 die("merging of trees %s and %s failed",
1700 sha1_to_hex(head
->object
.sha1
),
1701 sha1_to_hex(merge
->object
.sha1
));
1706 if (unmerged_cache()) {
1707 struct string_list
*entries
, *re_head
, *re_merge
;
1709 string_list_clear(&o
->current_file_set
, 1);
1710 string_list_clear(&o
->current_directory_set
, 1);
1711 get_files_dirs(o
, head
);
1712 get_files_dirs(o
, merge
);
1714 entries
= get_unmerged();
1715 record_df_conflict_files(o
, entries
);
1716 re_head
= get_renames(o
, head
, common
, head
, merge
, entries
);
1717 re_merge
= get_renames(o
, merge
, common
, head
, merge
, entries
);
1718 clean
= process_renames(o
, re_head
, re_merge
);
1719 for (i
= entries
->nr
-1; 0 <= i
; i
--) {
1720 const char *path
= entries
->items
[i
].string
;
1721 struct stage_data
*e
= entries
->items
[i
].util
;
1723 && !process_entry(o
, path
, e
))
1726 for (i
= 0; i
< entries
->nr
; i
++) {
1727 struct stage_data
*e
= entries
->items
[i
].util
;
1729 die("Unprocessed path??? %s",
1730 entries
->items
[i
].string
);
1733 string_list_clear(re_merge
, 0);
1734 string_list_clear(re_head
, 0);
1735 string_list_clear(entries
, 1);
1742 *result
= write_tree_from_memory(o
);
1747 static struct commit_list
*reverse_commit_list(struct commit_list
*list
)
1749 struct commit_list
*next
= NULL
, *current
, *backup
;
1750 for (current
= list
; current
; current
= backup
) {
1751 backup
= current
->next
;
1752 current
->next
= next
;
1759 * Merge the commits h1 and h2, return the resulting virtual
1760 * commit object and a flag indicating the cleanness of the merge.
1762 int merge_recursive(struct merge_options
*o
,
1765 struct commit_list
*ca
,
1766 struct commit
**result
)
1768 struct commit_list
*iter
;
1769 struct commit
*merged_common_ancestors
;
1770 struct tree
*mrtree
= mrtree
;
1774 output(o
, 4, "Merging:");
1775 output_commit_title(o
, h1
);
1776 output_commit_title(o
, h2
);
1780 ca
= get_merge_bases(h1
, h2
, 1);
1781 ca
= reverse_commit_list(ca
);
1785 output(o
, 5, "found %u common ancestor(s):", commit_list_count(ca
));
1786 for (iter
= ca
; iter
; iter
= iter
->next
)
1787 output_commit_title(o
, iter
->item
);
1790 merged_common_ancestors
= pop_commit(&ca
);
1791 if (merged_common_ancestors
== NULL
) {
1792 /* if there is no common ancestor, make an empty tree */
1793 struct tree
*tree
= xcalloc(1, sizeof(struct tree
));
1795 tree
->object
.parsed
= 1;
1796 tree
->object
.type
= OBJ_TREE
;
1797 pretend_sha1_file(NULL
, 0, OBJ_TREE
, tree
->object
.sha1
);
1798 merged_common_ancestors
= make_virtual_commit(tree
, "ancestor");
1801 for (iter
= ca
; iter
; iter
= iter
->next
) {
1802 const char *saved_b1
, *saved_b2
;
1805 * When the merge fails, the result contains files
1806 * with conflict markers. The cleanness flag is
1807 * ignored, it was never actually used, as result of
1808 * merge_trees has always overwritten it: the committed
1809 * "conflicts" were already resolved.
1812 saved_b1
= o
->branch1
;
1813 saved_b2
= o
->branch2
;
1814 o
->branch1
= "Temporary merge branch 1";
1815 o
->branch2
= "Temporary merge branch 2";
1816 merge_recursive(o
, merged_common_ancestors
, iter
->item
,
1817 NULL
, &merged_common_ancestors
);
1818 o
->branch1
= saved_b1
;
1819 o
->branch2
= saved_b2
;
1822 if (!merged_common_ancestors
)
1823 die("merge returned no commit");
1830 o
->ancestor
= "merged common ancestors";
1831 clean
= merge_trees(o
, h1
->tree
, h2
->tree
, merged_common_ancestors
->tree
,
1834 if (o
->call_depth
) {
1835 *result
= make_virtual_commit(mrtree
, "merged tree");
1836 commit_list_insert(h1
, &(*result
)->parents
);
1837 commit_list_insert(h2
, &(*result
)->parents
->next
);
1841 diff_warn_rename_limit("merge.renamelimit",
1842 o
->needed_rename_limit
, 0);
1846 static struct commit
*get_ref(const unsigned char *sha1
, const char *name
)
1848 struct object
*object
;
1850 object
= deref_tag(parse_object(sha1
), name
, strlen(name
));
1853 if (object
->type
== OBJ_TREE
)
1854 return make_virtual_commit((struct tree
*)object
, name
);
1855 if (object
->type
!= OBJ_COMMIT
)
1857 if (parse_commit((struct commit
*)object
))
1859 return (struct commit
*)object
;
1862 int merge_recursive_generic(struct merge_options
*o
,
1863 const unsigned char *head
,
1864 const unsigned char *merge
,
1866 const unsigned char **base_list
,
1867 struct commit
**result
)
1869 int clean
, index_fd
;
1870 struct lock_file
*lock
= xcalloc(1, sizeof(struct lock_file
));
1871 struct commit
*head_commit
= get_ref(head
, o
->branch1
);
1872 struct commit
*next_commit
= get_ref(merge
, o
->branch2
);
1873 struct commit_list
*ca
= NULL
;
1877 for (i
= 0; i
< num_base_list
; ++i
) {
1878 struct commit
*base
;
1879 if (!(base
= get_ref(base_list
[i
], sha1_to_hex(base_list
[i
]))))
1880 return error("Could not parse object '%s'",
1881 sha1_to_hex(base_list
[i
]));
1882 commit_list_insert(base
, &ca
);
1886 index_fd
= hold_locked_index(lock
, 1);
1887 clean
= merge_recursive(o
, head_commit
, next_commit
, ca
,
1889 if (active_cache_changed
&&
1890 (write_cache(index_fd
, active_cache
, active_nr
) ||
1891 commit_locked_index(lock
)))
1892 return error("Unable to write index.");
1894 return clean
? 0 : 1;
1897 static int merge_recursive_config(const char *var
, const char *value
, void *cb
)
1899 struct merge_options
*o
= cb
;
1900 if (!strcmp(var
, "merge.verbosity")) {
1901 o
->verbosity
= git_config_int(var
, value
);
1904 if (!strcmp(var
, "diff.renamelimit")) {
1905 o
->diff_rename_limit
= git_config_int(var
, value
);
1908 if (!strcmp(var
, "merge.renamelimit")) {
1909 o
->merge_rename_limit
= git_config_int(var
, value
);
1912 return git_xmerge_config(var
, value
, cb
);
1915 void init_merge_options(struct merge_options
*o
)
1917 memset(o
, 0, sizeof(struct merge_options
));
1919 o
->buffer_output
= 1;
1920 o
->diff_rename_limit
= -1;
1921 o
->merge_rename_limit
= -1;
1923 git_config(merge_recursive_config
, o
);
1924 if (getenv("GIT_MERGE_VERBOSITY"))
1926 strtol(getenv("GIT_MERGE_VERBOSITY"), NULL
, 10);
1927 if (o
->verbosity
>= 5)
1928 o
->buffer_output
= 0;
1929 strbuf_init(&o
->obuf
, 0);
1930 memset(&o
->current_file_set
, 0, sizeof(struct string_list
));
1931 o
->current_file_set
.strdup_strings
= 1;
1932 memset(&o
->current_directory_set
, 0, sizeof(struct string_list
));
1933 o
->current_directory_set
.strdup_strings
= 1;
1934 memset(&o
->df_conflict_file_set
, 0, sizeof(struct string_list
));
1935 o
->df_conflict_file_set
.strdup_strings
= 1;
1938 int parse_merge_opt(struct merge_options
*o
, const char *s
)
1942 if (!strcmp(s
, "ours"))
1943 o
->recursive_variant
= MERGE_RECURSIVE_OURS
;
1944 else if (!strcmp(s
, "theirs"))
1945 o
->recursive_variant
= MERGE_RECURSIVE_THEIRS
;
1946 else if (!strcmp(s
, "subtree"))
1947 o
->subtree_shift
= "";
1948 else if (!prefixcmp(s
, "subtree="))
1949 o
->subtree_shift
= s
+ strlen("subtree=");
1950 else if (!strcmp(s
, "patience"))
1951 o
->xdl_opts
|= XDF_PATIENCE_DIFF
;
1952 else if (!strcmp(s
, "ignore-space-change"))
1953 o
->xdl_opts
|= XDF_IGNORE_WHITESPACE_CHANGE
;
1954 else if (!strcmp(s
, "ignore-all-space"))
1955 o
->xdl_opts
|= XDF_IGNORE_WHITESPACE
;
1956 else if (!strcmp(s
, "ignore-space-at-eol"))
1957 o
->xdl_opts
|= XDF_IGNORE_WHITESPACE_AT_EOL
;
1958 else if (!strcmp(s
, "renormalize"))
1960 else if (!strcmp(s
, "no-renormalize"))
1962 else if (!prefixcmp(s
, "rename-threshold=")) {
1963 const char *score
= s
+ strlen("rename-threshold=");
1964 if ((o
->rename_score
= parse_rename_score(&score
)) == -1 || *score
!= 0)