🌐 AI搜索 & 代理 主页
Google Git
Sign in
chromium / external / github.com / git / git / refs/tags/v2.35.2 / . / merge.c
blob: 2382ff66d351cce20848b6f2ff056258adb2d4d7 [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 Kingc972bf42020-07-28 20:25:12[diff] [blame]22 struct strvec args = STRVEC_INIT;
Jeff King5c1753b2014-06-19 21:29:31[diff] [blame]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 Kingc972bf42020-07-28 20:25:12[diff] [blame]26 strvec_pushf(&args, "merge-%s", strategy);
Jeff King5c1753b2014-06-19 21:29:31[diff] [blame]27 for (i = 0; i < xopts_nr; i++)
Jeff Kingc972bf42020-07-28 20:25:12[diff] [blame]28 strvec_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 Kingc972bf42020-07-28 20:25:12[diff] [blame]30 strvec_push(&args, merge_argument(j->item));
31 strvec_push(&args, "--");
32 strvec_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 Kingc972bf42020-07-28 20:25:12[diff] [blame]34 strvec_push(&args, merge_argument(j->item));
Jeff King5c1753b2014-06-19 21:29:31[diff] [blame]35
Jeff Kingd70a9eb2020-07-29 00:37:20[diff] [blame]36 ret = run_command_v_opt(args.v, RUN_GIT_CMD);
Jeff Kingc972bf42020-07-28 20:25:12[diff] [blame]37 strvec_clear(&args);
Jeff King5c1753b2014-06-19 21:29:31[diff] [blame]38
Nguyễn Thái Ngọc Duy7e196c32018-09-21 15:57:29[diff] [blame]39 discard_index(r->index);
Nguyễn Thái Ngọc Duye1ff0a32019-01-12 02:13:26[diff] [blame]40 if (repo_read_index(r) < 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;
Martin Ågren837e34e2017-10-05 20:32:04[diff] [blame]56 struct lock_file lock_file = LOCK_INIT;
Nguyễn Thái Ngọc Duydb699a82012-10-26 15:53:49[diff] [blame]57
Nguyễn Thái Ngọc Duy7e196c32018-09-21 15:57:29[diff] [blame]58 refresh_index(r->index, REFRESH_QUIET, NULL, NULL, NULL);
Nguyễn Thái Ngọc Duydb699a82012-10-26 15:53:49[diff] [blame]59
Nguyễn Thái Ngọc Duy3a95f312019-01-12 02:13:24[diff] [blame]60 if (repo_hold_locked_index(r, &lock_file, LOCK_REPORT_ON_ERROR) < 0)
Johannes Schindelin55f57042016-09-09 14:38:00[diff] [blame]61 return -1;
Nguyễn Thái Ngọc Duydb699a82012-10-26 15:53:49[diff] [blame]62
63 memset(&trees, 0, sizeof(trees));
Nguyễn Thái Ngọc Duydb699a82012-10-26 15:53:49[diff] [blame]64 memset(&t, 0, sizeof(t));
Martin Ågren89e653d2018-05-20 10:17:34[diff] [blame]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));
Elijah Newren04988c82021-09-27 16:33:41[diff] [blame]82 opts.preserve_ignored = !overwrite_ignore;
Nguyễn Thái Ngọc Duydb699a82012-10-26 15:53:49[diff] [blame]83
84 opts.head_idx = 1;
Nguyễn Thái Ngọc Duy7e196c32018-09-21 15:57:29[diff] [blame]85 opts.src_index = r->index;
86 opts.dst_index = r->index;
Nguyễn Thái Ngọc Duydb699a82012-10-26 15:53:49[diff] [blame]87 opts.update = 1;
88 opts.verbose_update = 1;
89 opts.merge = 1;
90 opts.fn = twoway_merge;
brian m. carlson13e7ed62020-03-16 18:05:04[diff] [blame]91 init_checkout_metadata(&opts.meta, NULL, remote, NULL);
Nguyễn Thái Ngọc Duydb699a82012-10-26 15:53:49[diff] [blame]92 setup_unpack_trees_porcelain(&opts, "merge");
93
Martin Ågren5790d252018-02-28 19:07:57[diff] [blame]94 if (unpack_trees(nr_trees, t, &opts)) {
95 rollback_lock_file(&lock_file);
Martin Ågren1c41d282018-05-21 14:54:28[diff] [blame]96 clear_unpack_trees_porcelain(&opts);
Nguyễn Thái Ngọc Duydb699a82012-10-26 15:53:49[diff] [blame]97 return -1;
Martin Ågren5790d252018-02-28 19:07:57[diff] [blame]98 }
Martin Ågren1c41d282018-05-21 14:54:28[diff] [blame]99 clear_unpack_trees_porcelain(&opts);
100
Nguyễn Thái Ngọc Duy7e196c32018-09-21 15:57:29[diff] [blame]101 if (write_locked_index(r->index, &lock_file, COMMIT_LOCK))
Johannes Schindelin55f57042016-09-09 14:38:00[diff] [blame]102 return error(_("unable to write new index file"));
Nguyễn Thái Ngọc Duydb699a82012-10-26 15:53:49[diff] [blame]103 return 0;
104}