merge.c 2.78 KB
Newer Older
1
#include "cache.h"
2 3
#include "diff.h"
#include "diffcore.h"
4
#include "lockfile.h"
5 6 7 8 9 10 11 12 13
#include "commit.h"
#include "run-command.h"
#include "resolve-undo.h"
#include "tree-walk.h"
#include "unpack-trees.h"
#include "dir.h"

static const char *merge_argument(struct commit *commit)
{
14
	return oid_to_hex(commit ? &commit->object.oid : the_hash_algo->empty_tree);
15 16
}

17 18
int try_merge_command(struct repository *r,
		      const char *strategy, size_t xopts_nr,
19 20 21
		      const char **xopts, struct commit_list *common,
		      const char *head_arg, struct commit_list *remotes)
{
22 23
	struct argv_array args = ARGV_ARRAY_INIT;
	int i, ret;
24 25
	struct commit_list *j;

26 27 28
	argv_array_pushf(&args, "merge-%s", strategy);
	for (i = 0; i < xopts_nr; i++)
		argv_array_pushf(&args, "--%s", xopts[i]);
29
	for (j = common; j; j = j->next)
30 31 32
		argv_array_push(&args, merge_argument(j->item));
	argv_array_push(&args, "--");
	argv_array_push(&args, head_arg);
33
	for (j = remotes; j; j = j->next)
34 35 36 37 38
		argv_array_push(&args, merge_argument(j->item));

	ret = run_command_v_opt(args.argv, RUN_GIT_CMD);
	argv_array_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);
43 44 45 46

	return ret;
}

47 48
int checkout_fast_forward(struct repository *r,
			  const struct object_id *head,
49
			  const struct object_id *remote,
50 51 52 53 54
			  int overwrite_ignore)
{
	struct tree *trees[MAX_UNPACK_TREES];
	struct unpack_trees_options opts;
	struct tree_desc t[MAX_UNPACK_TREES];
55
	int i, nr_trees = 0;
56
	struct dir_struct dir;
57
	struct lock_file lock_file = LOCK_INIT;
58

59
	refresh_index(r->index, REFRESH_QUIET, NULL, NULL, NULL);
60

61
	if (repo_hold_locked_index(r, &lock_file, LOCK_REPORT_ON_ERROR) < 0)
62
		return -1;
63 64 65

	memset(&trees, 0, sizeof(trees));
	memset(&t, 0, sizeof(t));
66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82

	trees[nr_trees] = parse_tree_indirect(head);
	if (!trees[nr_trees++]) {
		rollback_lock_file(&lock_file);
		return -1;
	}
	trees[nr_trees] = parse_tree_indirect(remote);
	if (!trees[nr_trees++]) {
		rollback_lock_file(&lock_file);
		return -1;
	}
	for (i = 0; i < nr_trees; i++) {
		parse_tree(trees[i]);
		init_tree_desc(t+i, trees[i]->buffer, trees[i]->size);
	}

	memset(&opts, 0, sizeof(opts));
83 84 85 86 87 88 89 90
	if (overwrite_ignore) {
		memset(&dir, 0, sizeof(dir));
		dir.flags |= DIR_SHOW_IGNORED;
		setup_standard_excludes(&dir);
		opts.dir = &dir;
	}

	opts.head_idx = 1;
91 92
	opts.src_index = r->index;
	opts.dst_index = r->index;
93 94 95 96 97 98
	opts.update = 1;
	opts.verbose_update = 1;
	opts.merge = 1;
	opts.fn = twoway_merge;
	setup_unpack_trees_porcelain(&opts, "merge");

99 100
	if (unpack_trees(nr_trees, t, &opts)) {
		rollback_lock_file(&lock_file);
101
		clear_unpack_trees_porcelain(&opts);
102
		return -1;
103
	}
104 105
	clear_unpack_trees_porcelain(&opts);

106
	if (write_locked_index(r->index, &lock_file, COMMIT_LOCK))
107
		return error(_("unable to write new index file"));
108 109
	return 0;
}