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