Function pick_regular_commit

replay.c:266–345

}

static struct commit *pick_regular_commit(struct repository *repo,
					  struct commit *pickme,
					  kh_oid_map_t *replayed_commits,
					  struct commit *onto,
					  struct merge_options *merge_opt,
					  struct merge_result *result,
					  enum replay_mode mode,
					  enum replay_empty_commit_action empty)
{
	struct commit *base, *replayed_base;
	struct tree *pickme_tree, *base_tree, *replayed_base_tree;

	if (pickme->parents) {
		base = pickme->parents->item;
		base_tree = repo_get_commit_tree(repo, base);
	} else {
		base = NULL;
		base_tree = lookup_tree(repo, repo->hash_algo->empty_tree);
	}

	replayed_base = mapped_commit(replayed_commits, base, onto);
	replayed_base_tree = repo_get_commit_tree(repo, replayed_base);
	pickme_tree = repo_get_commit_tree(repo, pickme);

	if (mode == REPLAY_MODE_PICK) {
		/* Cherry-pick: normal order */
		merge_opt->branch1 = short_commit_name(repo, replayed_base);
		merge_opt->branch2 = short_commit_name(repo, pickme);
		if (pickme->parents)
			merge_opt->ancestor = xstrfmt("parent of %s", merge_opt->branch2);
		else
			merge_opt->ancestor = xstrdup("empty tree");

		merge_incore_nonrecursive(merge_opt,
					  base_tree,
					  replayed_base_tree,
					  pickme_tree,
					  result);

		free((char *)merge_opt->ancestor);
	} else if (mode == REPLAY_MODE_REVERT) {
		/* Revert: swap base and pickme to reverse the diff */
		const char *pickme_name = short_commit_name(repo, pickme);
		merge_opt->branch1 = short_commit_name(repo, replayed_base);
		merge_opt->branch2 = xstrfmt("parent of %s", pickme_name);
		merge_opt->ancestor = pickme_name;

		merge_incore_nonrecursive(merge_opt,
					  pickme_tree,
					  replayed_base_tree,
					  base_tree,
					  result);

		free((char *)merge_opt->branch2);
	} else {
		BUG("unexpected replay mode %d", mode);
	}
	merge_opt->ancestor = NULL;