Merge branch 'rs/fsck-obj-leakfix' into next

diff --git a/submodule.h b/submodule.h
index 8022faa591f0d35d57189e50670ef28f66134d86..e402b004ff0a7d983d196eb1fc0e34bdd2bacb93 100644 (file)
--- a/submodule.h
+++ b/submodule.h
@@ -49,7 +49,7 @@ int option_parse_recurse_submodules_worktree_updater(const struct option *opt,
 void load_submodule_cache(void);
 extern void gitmodules_config(void);
 extern void repo_read_gitmodules(struct repository *repo);
-extern void gitmodules_config_sha1(const unsigned char *commit_sha1);
+extern void gitmodules_config_oid(const struct object_id *commit_oid);
 extern int is_submodule_active(struct repository *repo, const char *path);
 /*
  * Determine if a submodule has been populated at a given 'path' by checking if