🌐 AI搜索 & 代理 主页
Google Git
Sign in
chromium / external / github.com / git / git / refs/tags/v2.20.5 / . / merge.c
blob: 91008f760223e4f6c65a5d344bb6403dd5885d28 [file] [log] [blame]
Nguyễn Thái Ngọc Duydb699a82012-10-26 15:53:49[diff] [blame]1#include "cache.h"
Elijah Newrenb1017932017-12-21 19:19:06[diff] [blame]2#include "diff.h"
3#include "diffcore.h"
Michael Haggerty697cc8e2014-10-01 10:28:42[diff] [blame]4#include "lockfile.h"
Nguyễn Thái Ngọc Duydb699a82012-10-26 15:53:49[diff] [blame]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{
brian m. carlsone9fe6f22018-05-02 00:25:57[diff] [blame]14 return oid_to_hex(commit ? &commit->object.oid : the_hash_algo->empty_tree);
Nguyễn Thái Ngọc Duydb699a82012-10-26 15:53:49[diff] [blame]15}
16
Nguyễn Thái Ngọc Duy7e196c32018-09-21 15:57:29[diff] [blame]17int try_merge_command(struct repository *r,
18 const char *strategy, size_t xopts_nr,
Nguyễn Thái Ngọc Duydb699a82012-10-26 15:53:49[diff] [blame]19 const char **xopts, struct commit_list *common,
20 const char *head_arg, struct commit_list *remotes)
21{
Jeff King5c1753b2014-06-19 21:29:31[diff] [blame]22 struct argv_array args = ARGV_ARRAY_INIT;
23 int i, ret;
Nguyễn Thái Ngọc Duydb699a82012-10-26 15:53:49[diff] [blame]24 struct commit_list *j;
Nguyễn Thái Ngọc Duydb699a82012-10-26 15:53:49[diff] [blame]25
Jeff King5c1753b2014-06-19 21:29:31[diff] [blame]26 argv_array_pushf(&args, "merge-%s", strategy);
27 for (i = 0; i < xopts_nr; i++)
28 argv_array_pushf(&args, "--%s", xopts[i]);
Nguyễn Thái Ngọc Duydb699a82012-10-26 15:53:49[diff] [blame]29 for (j = common; j; j = j->next)
Jeff King5c1753b2014-06-19 21:29:31[diff] [blame]30 argv_array_push(&args, merge_argument(j->item));
31 argv_array_push(&args, "--");
32 argv_array_push(&args, head_arg);
Nguyễn Thái Ngọc Duydb699a82012-10-26 15:53:49[diff] [blame]33 for (j = remotes; j; j = j->next)
Jeff King5c1753b2014-06-19 21:29:31[diff] [blame]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
Nguyễn Thái Ngọc Duy7e196c32018-09-21 15:57:29[diff] [blame]39 discard_index(r->index);
40 if (read_index(r->index) < 0)
Nguyễn Thái Ngọc Duydb699a82012-10-26 15:53:49[diff] [blame]41 die(_("failed to read the cache"));
Nguyễn Thái Ngọc Duy7e196c32018-09-21 15:57:29[diff] [blame]42 resolve_undo_clear_index(r->index);
Nguyễn Thái Ngọc Duydb699a82012-10-26 15:53:49[diff] [blame]43
44 return ret;
45}
46
Nguyễn Thái Ngọc Duy7e196c32018-09-21 15:57:29[diff] [blame]47int checkout_fast_forward(struct repository *r,
48 const struct object_id *head,
brian m. carlsonf06e90d2017-05-06 22:10:33[diff] [blame]49 const struct object_id *remote,
Nguyễn Thái Ngọc Duydb699a82012-10-26 15:53:49[diff] [blame]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];
Nguyễn Thái Ngọc Duy03b86642014-06-13 12:19:23[diff] [blame]55 int i, nr_trees = 0;
Nguyễn Thái Ngọc Duydb699a82012-10-26 15:53:49[diff] [blame]56 struct dir_struct dir;
Martin Ågren837e34e2017-10-05 20:32:04[diff] [blame]57 struct lock_file lock_file = LOCK_INIT;
Nguyễn Thái Ngọc Duydb699a82012-10-26 15:53:49[diff] [blame]58
Nguyễn Thái Ngọc Duy7e196c32018-09-21 15:57:29[diff] [blame]59 refresh_index(r->index, REFRESH_QUIET, NULL, NULL, NULL);
Nguyễn Thái Ngọc Duydb699a82012-10-26 15:53:49[diff] [blame]60
Martin Ågren837e34e2017-10-05 20:32:04[diff] [blame]61 if (hold_locked_index(&lock_file, LOCK_REPORT_ON_ERROR) < 0)
Johannes Schindelin55f57042016-09-09 14:38:00[diff] [blame]62 return -1;
Nguyễn Thái Ngọc Duydb699a82012-10-26 15:53:49[diff] [blame]63
64 memset(&trees, 0, sizeof(trees));
Nguyễn Thái Ngọc Duydb699a82012-10-26 15:53:49[diff] [blame]65 memset(&t, 0, sizeof(t));
Martin Ågren89e653d2018-05-20 10:17:34[diff] [blame]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));
Nguyễn Thái Ngọc Duydb699a82012-10-26 15:53:49[diff] [blame]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;
Nguyễn Thái Ngọc Duy7e196c32018-09-21 15:57:29[diff] [blame]91 opts.src_index = r->index;
92 opts.dst_index = r->index;
Nguyễn Thái Ngọc Duydb699a82012-10-26 15:53:49[diff] [blame]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
Martin Ågren5790d252018-02-28 19:07:57[diff] [blame]99 if (unpack_trees(nr_trees, t, &opts)) {
100 rollback_lock_file(&lock_file);
Martin Ågren1c41d282018-05-21 14:54:28[diff] [blame]101 clear_unpack_trees_porcelain(&opts);
Nguyễn Thái Ngọc Duydb699a82012-10-26 15:53:49[diff] [blame]102 return -1;
Martin Ågren5790d252018-02-28 19:07:57[diff] [blame]103 }
Martin Ågren1c41d282018-05-21 14:54:28[diff] [blame]104 clear_unpack_trees_porcelain(&opts);
105
Nguyễn Thái Ngọc Duy7e196c32018-09-21 15:57:29[diff] [blame]106 if (write_locked_index(r->index, &lock_file, COMMIT_LOCK))
Johannes Schindelin55f57042016-09-09 14:38:00[diff] [blame]107 return error(_("unable to write new index file"));
Nguyễn Thái Ngọc Duydb699a82012-10-26 15:53:49[diff] [blame]108 return 0;
109}