Merge branch 'hx/lookup-commit-in-graph-fix' into maint
[git/debian.git] / merge.c
blob2382ff66d351cce20848b6f2ff056258adb2d4d7
1 #include "cache.h"
2 #include "diff.h"
3 #include "diffcore.h"
4 #include "lockfile.h"
5 #include "commit.h"
6 #include "run-command.h"
7 #include "resolve-undo.h"
8 #include "tree-walk.h"
9 #include "unpack-trees.h"
10 #include "dir.h"
12 static const char *merge_argument(struct commit *commit)
14 return oid_to_hex(commit ? &commit->object.oid : the_hash_algo->empty_tree);
17 int try_merge_command(struct repository *r,
18 const char *strategy, size_t xopts_nr,
19 const char **xopts, struct commit_list *common,
20 const char *head_arg, struct commit_list *remotes)
22 struct strvec args = STRVEC_INIT;
23 int i, ret;
24 struct commit_list *j;
26 strvec_pushf(&args, "merge-%s", strategy);
27 for (i = 0; i < xopts_nr; i++)
28 strvec_pushf(&args, "--%s", xopts[i]);
29 for (j = common; j; j = j->next)
30 strvec_push(&args, merge_argument(j->item));
31 strvec_push(&args, "--");
32 strvec_push(&args, head_arg);
33 for (j = remotes; j; j = j->next)
34 strvec_push(&args, merge_argument(j->item));
36 ret = run_command_v_opt(args.v, RUN_GIT_CMD);
37 strvec_clear(&args);
39 discard_index(r->index);
40 if (repo_read_index(r) < 0)
41 die(_("failed to read the cache"));
42 resolve_undo_clear_index(r->index);
44 return ret;
47 int checkout_fast_forward(struct repository *r,
48 const struct object_id *head,
49 const struct object_id *remote,
50 int overwrite_ignore)
52 struct tree *trees[MAX_UNPACK_TREES];
53 struct unpack_trees_options opts;
54 struct tree_desc t[MAX_UNPACK_TREES];
55 int i, nr_trees = 0;
56 struct lock_file lock_file = LOCK_INIT;
58 refresh_index(r->index, REFRESH_QUIET, NULL, NULL, NULL);
60 if (repo_hold_locked_index(r, &lock_file, LOCK_REPORT_ON_ERROR) < 0)
61 return -1;
63 memset(&trees, 0, sizeof(trees));
64 memset(&t, 0, sizeof(t));
66 trees[nr_trees] = parse_tree_indirect(head);
67 if (!trees[nr_trees++]) {
68 rollback_lock_file(&lock_file);
69 return -1;
71 trees[nr_trees] = parse_tree_indirect(remote);
72 if (!trees[nr_trees++]) {
73 rollback_lock_file(&lock_file);
74 return -1;
76 for (i = 0; i < nr_trees; i++) {
77 parse_tree(trees[i]);
78 init_tree_desc(t+i, trees[i]->buffer, trees[i]->size);
81 memset(&opts, 0, sizeof(opts));
82 opts.preserve_ignored = !overwrite_ignore;
84 opts.head_idx = 1;
85 opts.src_index = r->index;
86 opts.dst_index = r->index;
87 opts.update = 1;
88 opts.verbose_update = 1;
89 opts.merge = 1;
90 opts.fn = twoway_merge;
91 init_checkout_metadata(&opts.meta, NULL, remote, NULL);
92 setup_unpack_trees_porcelain(&opts, "merge");
94 if (unpack_trees(nr_trees, t, &opts)) {
95 rollback_lock_file(&lock_file);
96 clear_unpack_trees_porcelain(&opts);
97 return -1;
99 clear_unpack_trees_porcelain(&opts);
101 if (write_locked_index(r->index, &lock_file, COMMIT_LOCK))
102 return error(_("unable to write new index file"));
103 return 0;