Merge branch 'nd/fixup-linked-gitdir' into maint

diff --git a/cache.h b/cache.h
index 4f554664c5bd064405082797ee1e8786ebdcea75..c9e2f7487b10d06cbdea37cbdd754acfad551098 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -1446,6 +1446,7 @@ extern int git_config_pathname(const char **, const char *, const char *);
 extern int git_config_set_in_file(const char *, const char *, const char *);
 extern int git_config_set(const char *, const char *);
 extern int git_config_parse_key(const char *, char **, int *);
+extern int git_config_key_is_valid(const char *key);
 extern int git_config_set_multivar(const char *, const char *, const char *, int);
 extern int git_config_set_multivar_in_file(const char *, const char *, const char *, const char *, int);
 extern int git_config_rename_section(const char *, const char *);