Merge branch 'ah/doc-submodule-ignore-submodules'
[git/git.git] / merge.c
CommitLineData
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
12static 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
17int 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{
5c1753b1
JK
22 struct argv_array args = ARGV_ARRAY_INIT;
23 int i, ret;
db699a8a 24 struct commit_list *j;
db699a8a 25
5c1753b1
JK
26 argv_array_pushf(&args, "merge-%s", strategy);
27 for (i = 0; i < xopts_nr; i++)
28 argv_array_pushf(&args, "--%s", xopts[i]);
db699a8a 29 for (j = common; j; j = j->next)
5c1753b1
JK
30 argv_array_push(&args, merge_argument(j->item));
31 argv_array_push(&args, "--");
32 argv_array_push(&args, head_arg);
db699a8a 33 for (j = remotes; j; j = j->next)
5c1753b1
JK
34 argv_array_push(&args, merge_argument(j->item));
35
36 ret = run_command_v_opt(args.argv, RUN_GIT_CMD);
37 argv_array_clear(&args);
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
47int 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;
db699a8a 56 struct dir_struct dir;
837e34eb 57 struct lock_file lock_file = LOCK_INIT;
db699a8a 58
7e196c3a 59 refresh_index(r->index, REFRESH_QUIET, NULL, NULL, NULL);
db699a8a 60
3a95f31d 61 if (repo_hold_locked_index(r, &lock_file, LOCK_REPORT_ON_ERROR) < 0)
55f5704d 62 return -1;
db699a8a
NTND
63
64 memset(&trees, 0, sizeof(trees));
db699a8a 65 memset(&t, 0, sizeof(t));
89e653da
66
67 trees[nr_trees] = parse_tree_indirect(head);
68 if (!trees[nr_trees++]) {
69 rollback_lock_file(&lock_file);
70 return -1;
71 }
72 trees[nr_trees] = parse_tree_indirect(remote);
73 if (!trees[nr_trees++]) {
74 rollback_lock_file(&lock_file);
75 return -1;
76 }
77 for (i = 0; i < nr_trees; i++) {
78 parse_tree(trees[i]);
79 init_tree_desc(t+i, trees[i]->buffer, trees[i]->size);
80 }
81
82 memset(&opts, 0, sizeof(opts));
db699a8a
NTND
83 if (overwrite_ignore) {
84 memset(&dir, 0, sizeof(dir));
85 dir.flags |= DIR_SHOW_IGNORED;
86 setup_standard_excludes(&dir);
87 opts.dir = &dir;
88 }
89
90 opts.head_idx = 1;
7e196c3a
NTND
91 opts.src_index = r->index;
92 opts.dst_index = r->index;
db699a8a
NTND
93 opts.update = 1;
94 opts.verbose_update = 1;
95 opts.merge = 1;
96 opts.fn = twoway_merge;
97 setup_unpack_trees_porcelain(&opts, "merge");
98
5790d258
99 if (unpack_trees(nr_trees, t, &opts)) {
100 rollback_lock_file(&lock_file);
1c41d280 101 clear_unpack_trees_porcelain(&opts);
db699a8a 102 return -1;
5790d258 103 }
1c41d280
104 clear_unpack_trees_porcelain(&opts);
105
7e196c3a 106 if (write_locked_index(r->index, &lock_file, COMMIT_LOCK))
55f5704d 107 return error(_("unable to write new index file"));
db699a8a
NTND
108 return 0;
109}