diff options
| author | brian m. carlson <sandals@crustytoothpaste.net> | 2017-05-06 22:10:33 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-05-08 15:12:58 +0900 |
| commit | f06e90dac1f63f46d299ca728464fb0a450f6972 (patch) | |
| tree | 6b64076fb7d478c523ca915892f497b9d75b8932 /merge.c | |
| parent | ace976b26ced2f35415119984f9d58d26b478afd (diff) | |
| download | git-f06e90dac1f63f46d299ca728464fb0a450f6972.tar.gz | |
merge: convert checkout_fast_forward to struct object_id
Converting checkout_fast_forward is required to convert
parse_tree_indirect.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge.c')
| -rw-r--r-- | merge.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -44,8 +44,8 @@ int try_merge_command(const char *strategy, size_t xopts_nr, return ret; } -int checkout_fast_forward(const unsigned char *head, - const unsigned char *remote, +int checkout_fast_forward(const struct object_id *head, + const struct object_id *remote, int overwrite_ignore) { struct tree *trees[MAX_UNPACK_TREES]; @@ -79,10 +79,10 @@ int checkout_fast_forward(const unsigned char *head, opts.fn = twoway_merge; setup_unpack_trees_porcelain(&opts, "merge"); - trees[nr_trees] = parse_tree_indirect(head); + trees[nr_trees] = parse_tree_indirect(head->hash); if (!trees[nr_trees++]) return -1; - trees[nr_trees] = parse_tree_indirect(remote); + trees[nr_trees] = parse_tree_indirect(remote->hash); if (!trees[nr_trees++]) return -1; for (i = 0; i < nr_trees; i++) { |