[PATCH] Provide access to git_dir through get_git_dir().
Signed-off-by: Sven Verdoolaege <skimo@kotnet.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Sven Verdoolaege committed
Sep 26, 2005 at 22:54 UTC
5da1606d0bf5b970fadfa0ca91618a1e871f6755
4 files changed
+10
-7
cache.h
+1
@@ -136,6 +136,7 @@ extern unsigned int active_nr, active_alloc, active_cache_changed;
136
#define INDEX_ENVIRONMENT "GIT_INDEX_FILE"
137
#define GRAFT_ENVIRONMENT "GIT_GRAFT_FILE"
138
139
+extern char *get_git_dir(void);
140
extern char *get_object_directory(void);
141
extern char *get_refs_directory(void);
142
extern char *get_index_file(void);
fsck-objects.c
+1
-4
@@ -406,10 +406,7 @@ static int fsck_head_link(void)
406
char hex[40];
407
unsigned char sha1[20];
408
static char path[PATH_MAX], link[PATH_MAX];
409
- const char *git_dir;
410
-
411
- git_dir = getenv(GIT_DIR_ENVIRONMENT);
412
- if (!git_dir) git_dir = DEFAULT_GIT_DIR_ENVIRONMENT;
409
+ const char *git_dir = get_git_dir();
410
411
snprintf(path, sizeof(path), "%s/HEAD", git_dir);
412
if (readlink(path, link, sizeof(link)) < 0)
path.c
+1
-3
@@ -41,12 +41,10 @@ char *mkpath(const char *fmt, ...)
41
42
char *git_path(const char *fmt, ...)
43
{
44
- const char *git_dir;
44
+ const char *git_dir = get_git_dir();
45
va_list args;
46
unsigned len;
47
48
- git_dir = getenv(GIT_DIR_ENVIRONMENT);
49
- if (!git_dir) git_dir = DEFAULT_GIT_DIR_ENVIRONMENT;
48
len = strlen(git_dir);
49
if (len > PATH_MAX-100)
50
return bad_path;
sha1_file.c
+7
@@ -70,6 +70,13 @@ static void setup_git_env(void)
70
git_graft_file = strdup(git_path("info/grafts"));
71
}
72
73
+char *get_git_dir(void)
74
+{
75
+ if (!git_dir)
76
+ setup_git_env();
77
+ return git_dir;
78
+}
79
+
80
char *get_object_directory(void)
81
{
82
if (!git_object_dir)