summaryrefslogtreecommitdiff
path: root/environment.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-01-07 02:00:28 -0800
committerJunio C Hamano <junkio@cox.net>2007-01-07 21:36:35 -0800
commit7d1864ce67d83485cf5cbc8c90fc170ee884ef16 (patch)
treec6283633ed659deb0cfdecd52f41d63104bc569a /environment.c
parent510c5a8ee392fd2ab954b676bae486b53f444013 (diff)
downloadgit-7d1864ce67d83485cf5cbc8c90fc170ee884ef16.tar.gz
Introduce is_bare_repository() and core.bare configuration variable
This removes the old is_bare_git_dir(const char *) to ask if a directory, if it is a GIT_DIR, is a bare repository, and replaces it with is_bare_repository(void *). The function looks at core.bare configuration variable if exists but uses the old heuristics: if it is ".git" or ends with "/.git", then it does not look like a bare repository, otherwise it does. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'environment.c')
-rw-r--r--environment.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/environment.c b/environment.c
index 64245e77a9..54c22f8248 100644
--- a/environment.c
+++ b/environment.c
@@ -15,6 +15,7 @@ int use_legacy_headers = 1;
int trust_executable_bit = 1;
int assume_unchanged;
int prefer_symlink_refs;
+int is_bare_repository_cfg = -1; /* unspecified */
int log_all_ref_updates = -1; /* unspecified */
int warn_ambiguous_refs = 1;
int repository_format_version;
@@ -53,9 +54,13 @@ static void setup_git_env(void)
git_graft_file = xstrdup(git_path("info/grafts"));
}
-int is_bare_git_dir(const char *dir)
+int is_bare_repository(void)
{
- const char *s;
+ const char *dir, *s;
+ if (0 <= is_bare_repository_cfg)
+ return is_bare_repository_cfg;
+
+ dir = get_git_dir();
if (!strcmp(dir, DEFAULT_GIT_DIR_ENVIRONMENT))
return 0;
s = strrchr(dir, '/');