Merge remote-tracking branch 'git-po/maint'

diff --git a/tree-walk.h b/tree-walk.h
index 4617deeb0e09e71c7ba7231192ece055eccb2dde..805f58f00f6f0d4c9e6f6f05520bd1cd62d5f661 100644 (file)
--- a/tree-walk.h
+++ b/tree-walk.h
@@ -64,7 +64,7 @@ enum follow_symlinks_result {
                       */
 };
 
-enum follow_symlinks_result get_tree_entry_follow_symlinks(unsigned char *tree_sha1, const char *name, unsigned char *result, struct strbuf *result_path, unsigned *mode);
+enum follow_symlinks_result get_tree_entry_follow_symlinks(struct object_id *tree_oid, const char *name, struct object_id *result, struct strbuf *result_path, unsigned *mode);
 
 struct traverse_info {
        const char *traverse_path;