diff options
| author | brian m. carlson <sandals@crustytoothpaste.net> | 2017-05-06 22:10:33 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-05-08 06:12:58 (GMT) |
| commit | f06e90dac1f63f46d299ca728464fb0a450f6972 (patch) | |
| tree | 6b64076fb7d478c523ca915892f497b9d75b8932 /builtin/merge.c | |
| parent | ace976b26ced2f35415119984f9d58d26b478afd (diff) | |
| download | git-f06e90dac1f63f46d299ca728464fb0a450f6972.zip git-f06e90dac1f63f46d299ca728464fb0a450f6972.tar.gz git-f06e90dac1f63f46d299ca728464fb0a450f6972.tar.bz2 | |
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 'builtin/merge.c')
| -rw-r--r-- | builtin/merge.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index f11b5f3..5ea7f7d 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -1372,8 +1372,8 @@ int cmd_merge(int argc, const char **argv, const char *prefix) goto done; } - if (checkout_fast_forward(head_commit->object.oid.hash, - commit->object.oid.hash, + if (checkout_fast_forward(&head_commit->object.oid, + &commit->object.oid, overwrite_ignore)) { ret = 1; goto done; |