summaryrefslogtreecommitdiff
path: root/config.h
diff options
context:
space:
mode:
authorbrian m. carlson <sandals@crustytoothpaste.net>2017-07-13 23:49:20 +0000
committerJunio C Hamano <gitster@pobox.com>2017-07-17 13:54:37 -0700
commitcd73de47148c16760a62fa3f75cafe015ca764b2 (patch)
tree307e99cfba18e3b880af01bf9656a961298439fd /config.h
parentd1a35e5c93eb57abd1133a8c55ba961cc55268a6 (diff)
downloadgit-cd73de47148c16760a62fa3f75cafe015ca764b2.tar.gz
submodule: convert submodule config lookup to use object_id
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'config.h')
-rw-r--r--config.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/config.h b/config.h
index 0352da117b..827f2b0e4a 100644
--- a/config.h
+++ b/config.h
@@ -39,8 +39,8 @@ extern int git_default_config(const char *, const char *, void *);
extern int git_config_from_file(config_fn_t fn, const char *, void *);
extern int git_config_from_mem(config_fn_t fn, const enum config_origin_type,
const char *name, const char *buf, size_t len, void *data);
-extern int git_config_from_blob_sha1(config_fn_t fn, const char *name,
- const unsigned char *sha1, void *data);
+extern int git_config_from_blob_oid(config_fn_t fn, const char *name,
+ const struct object_id *oid, void *data);
extern void git_config_push_parameter(const char *text);
extern int git_config_from_parameters(config_fn_t fn, void *data);
extern void read_early_config(config_fn_t cb, void *data);