Merge branch 'bc/object-id'

diff --git a/cache.h b/cache.h
index 188811920ccf5b389332db252e389ae17e88d59f..d1f2c5c08886643f0231945ca27f4d79026a3491 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -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);