aboutsummaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-02-16 17:56:51 -0800
committerJunio C Hamano <gitster@pobox.com>2008-02-16 17:56:51 -0800
commitfef1c4c0a0766b83cfacaf6276d7bd0d1aa9a2e4 (patch)
treea3c4cf94132da5755e874ef44bd8072d679ba0c8 /cache.h
parent093d50e0d226b879e24753ce18f4eb4b754807c6 (diff)
parent8bfa6bd6473b086ab2c5781daa08a7b5417c3d1f (diff)
downloadgit-fef1c4c0a0766b83cfacaf6276d7bd0d1aa9a2e4.tar.gz
git-fef1c4c0a0766b83cfacaf6276d7bd0d1aa9a2e4.tar.xz
Merge branch 'jk/noetcconfig'
* jk/noetcconfig: fix config reading in tests allow suppressing of global and system config Conflicts: cache.h
Diffstat (limited to 'cache.h')
-rw-r--r--cache.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/cache.h b/cache.h
index cdcabe92b..efd31d856 100644
--- a/cache.h
+++ b/cache.h
@@ -631,6 +631,9 @@ extern int git_config_set_multivar(const char *, const char *, const char *, int
extern int git_config_rename_section(const char *, const char *);
extern const char *git_etc_gitconfig(void);
extern int check_repository_format_version(const char *var, const char *value);
+extern int git_env_bool(const char *, int);
+extern int git_config_system(void);
+extern int git_config_global(void);
extern int config_error_nonbool(const char *);
#define MAX_GITNAME (1000)