summaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-03-22 21:38:12 -0700
committerJunio C Hamano <gitster@pobox.com>2011-03-22 21:38:12 -0700
commit50aaeca008194854dcc90836edaff58b9be6e0fc (patch)
treee164971f944a45756841b17813f59ce345e31caa /cache.h
parentf59bf09678ae33901febdf61e03c91bb8eebd970 (diff)
parent95a1d12e9b9faddc02187ca28fdeb4fddd354c59 (diff)
downloadgit-50aaeca008194854dcc90836edaff58b9be6e0fc.tar.gz
Merge branch 'jn/test-sanitize-git-env'
* jn/test-sanitize-git-env: tests: scrub environment of GIT_* variables config: drop support for GIT_CONFIG_NOGLOBAL gitattributes: drop support for GIT_ATTR_NOGLOBAL tests: suppress system gitattributes tests: stop worrying about obsolete environment variables
Diffstat (limited to 'cache.h')
-rw-r--r--cache.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/cache.h b/cache.h
index be6ce7237d..872bc9be11 100644
--- a/cache.h
+++ b/cache.h
@@ -1022,7 +1022,6 @@ extern const char *git_etc_gitconfig(void);
extern int check_repository_format_version(const char *var, const char *value, void *cb);
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 *);
extern const char *get_log_output_encoding(void);
extern const char *get_commit_output_encoding(void);