diff options
author | brian m. carlson <sandals@crustytoothpaste.net> | 2017-05-07 01:10:33 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-05-08 09:12:58 +0300 |
commit | f06e90dac1f63f46d299ca728464fb0a450f6972 (patch) | |
tree | 6b64076fb7d478c523ca915892f497b9d75b8932 /cache.h | |
parent | ace976b26ced2f35415119984f9d58d26b478afd (diff) |
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 'cache.h')
-rw-r--r-- | cache.h | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -2198,8 +2198,8 @@ struct commit_list; int try_merge_command(const char *strategy, size_t xopts_nr, const char **xopts, struct commit_list *common, const char *head_arg, struct commit_list *remotes); -int checkout_fast_forward(const unsigned char *from, - const unsigned char *to, +int checkout_fast_forward(const struct object_id *from, + const struct object_id *to, int overwrite_ignore); |