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