From cd73de47148c16760a62fa3f75cafe015ca764b2 Mon Sep 17 00:00:00 2001 From: "brian m. carlson" Date: Thu, 13 Jul 2017 23:49:20 +0000 Subject: submodule: convert submodule config lookup to use object_id Signed-off-by: brian m. carlson Signed-off-by: Junio C Hamano --- submodule-config.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'submodule-config.h') diff --git a/submodule-config.h b/submodule-config.h index bc45a25e85..5f52e6567b 100644 --- a/submodule-config.h +++ b/submodule-config.h @@ -34,15 +34,15 @@ extern int parse_submodule_config_option(const char *var, const char *value); extern int submodule_config_option(struct repository *repo, const char *var, const char *value); extern const struct submodule *submodule_from_name( - const unsigned char *commit_or_tree, const char *name); + const struct object_id *commit_or_tree, const char *name); extern const struct submodule *submodule_from_path( - const unsigned char *commit_or_tree, const char *path); + const struct object_id *commit_or_tree, const char *path); extern const struct submodule *submodule_from_cache(struct repository *repo, - const unsigned char *treeish_name, + const struct object_id *treeish_name, const char *key); -extern int gitmodule_sha1_from_commit(const unsigned char *commit_sha1, - unsigned char *gitmodules_sha1, - struct strbuf *rev); +extern int gitmodule_oid_from_commit(const struct object_id *commit_oid, + struct object_id *gitmodules_oid, + struct strbuf *rev); extern void submodule_free(void); #endif /* SUBMODULE_CONFIG_H */ -- cgit v1.2.3