]>
Commit | Line | Data |
---|---|---|
db699a8a | 1 | #include "cache.h" |
b101793c EN |
2 | #include "diff.h" |
3 | #include "diffcore.h" | |
697cc8ef | 4 | #include "lockfile.h" |
db699a8a NTND |
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" | |
11 | ||
12 | static const char *merge_argument(struct commit *commit) | |
13 | { | |
e9fe6f26 | 14 | return oid_to_hex(commit ? &commit->object.oid : the_hash_algo->empty_tree); |
db699a8a NTND |
15 | } |
16 | ||
7e196c3a NTND |
17 | int try_merge_command(struct repository *r, |
18 | const char *strategy, size_t xopts_nr, | |
db699a8a NTND |
19 | const char **xopts, struct commit_list *common, |
20 | const char *head_arg, struct commit_list *remotes) | |
21 | { | |
c972bf4c | 22 | struct strvec args = STRVEC_INIT; |
5c1753b1 | 23 | int i, ret; |
db699a8a | 24 | struct commit_list *j; |
db699a8a | 25 | |
c972bf4c | 26 | strvec_pushf(&args, "merge-%s", strategy); |
5c1753b1 | 27 | for (i = 0; i < xopts_nr; i++) |
c972bf4c | 28 | strvec_pushf(&args, "--%s", xopts[i]); |
db699a8a | 29 | for (j = common; j; j = j->next) |
c972bf4c JK |
30 | strvec_push(&args, merge_argument(j->item)); |
31 | strvec_push(&args, "--"); | |
32 | strvec_push(&args, head_arg); | |
db699a8a | 33 | for (j = remotes; j; j = j->next) |
c972bf4c | 34 | strvec_push(&args, merge_argument(j->item)); |
5c1753b1 | 35 | |
d70a9eb6 | 36 | ret = run_command_v_opt(args.v, RUN_GIT_CMD); |
c972bf4c | 37 | strvec_clear(&args); |
5c1753b1 | 38 | |
7e196c3a | 39 | discard_index(r->index); |
e1ff0a32 | 40 | if (repo_read_index(r) < 0) |
db699a8a | 41 | die(_("failed to read the cache")); |
7e196c3a | 42 | resolve_undo_clear_index(r->index); |
db699a8a NTND |
43 | |
44 | return ret; | |
45 | } | |
46 | ||
7e196c3a NTND |
47 | int checkout_fast_forward(struct repository *r, |
48 | const struct object_id *head, | |
f06e90da | 49 | const struct object_id *remote, |
db699a8a NTND |
50 | int overwrite_ignore) |
51 | { | |
52 | struct tree *trees[MAX_UNPACK_TREES]; | |
53 | struct unpack_trees_options opts; | |
54 | struct tree_desc t[MAX_UNPACK_TREES]; | |
03b86647 | 55 | int i, nr_trees = 0; |
837e34eb | 56 | struct lock_file lock_file = LOCK_INIT; |
db699a8a | 57 | |
7e196c3a | 58 | refresh_index(r->index, REFRESH_QUIET, NULL, NULL, NULL); |
db699a8a | 59 | |
3a95f31d | 60 | if (repo_hold_locked_index(r, &lock_file, LOCK_REPORT_ON_ERROR) < 0) |
55f5704d | 61 | return -1; |
db699a8a NTND |
62 | |
63 | memset(&trees, 0, sizeof(trees)); | |
db699a8a | 64 | memset(&t, 0, sizeof(t)); |
89e653da MÅ |
65 | |
66 | trees[nr_trees] = parse_tree_indirect(head); | |
67 | if (!trees[nr_trees++]) { | |
68 | rollback_lock_file(&lock_file); | |
69 | return -1; | |
70 | } | |
71 | trees[nr_trees] = parse_tree_indirect(remote); | |
72 | if (!trees[nr_trees++]) { | |
73 | rollback_lock_file(&lock_file); | |
74 | return -1; | |
75 | } | |
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); | |
79 | } | |
80 | ||
81 | memset(&opts, 0, sizeof(opts)); | |
04988c8d | 82 | opts.preserve_ignored = !overwrite_ignore; |
db699a8a NTND |
83 | |
84 | opts.head_idx = 1; | |
7e196c3a NTND |
85 | opts.src_index = r->index; |
86 | opts.dst_index = r->index; | |
db699a8a NTND |
87 | opts.update = 1; |
88 | opts.verbose_update = 1; | |
89 | opts.merge = 1; | |
90 | opts.fn = twoway_merge; | |
13e7ed6a | 91 | init_checkout_metadata(&opts.meta, NULL, remote, NULL); |
db699a8a NTND |
92 | setup_unpack_trees_porcelain(&opts, "merge"); |
93 | ||
5790d258 MÅ |
94 | if (unpack_trees(nr_trees, t, &opts)) { |
95 | rollback_lock_file(&lock_file); | |
1c41d280 | 96 | clear_unpack_trees_porcelain(&opts); |
db699a8a | 97 | return -1; |
5790d258 | 98 | } |
1c41d280 MÅ |
99 | clear_unpack_trees_porcelain(&opts); |
100 | ||
7e196c3a | 101 | if (write_locked_index(r->index, &lock_file, COMMIT_LOCK)) |
55f5704d | 102 | return error(_("unable to write new index file")); |
db699a8a NTND |
103 | return 0; |
104 | } |