[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>

diff --git a/cache.h b/cache.h
index 6f3d39da73a2340857474fe57482897cea7ceee8..52a45f9c9a3f487ca7ba773d72109c3daca0685d 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -136,6 +136,7 @@ extern unsigned int active_nr, active_alloc, active_cache_changed;
 #define INDEX_ENVIRONMENT "GIT_INDEX_FILE"
 #define GRAFT_ENVIRONMENT "GIT_GRAFT_FILE"
 
 #define INDEX_ENVIRONMENT "GIT_INDEX_FILE"
 #define GRAFT_ENVIRONMENT "GIT_GRAFT_FILE"
 

+extern char *get_git_dir(void);

 extern char *get_object_directory(void);
 extern char *get_refs_directory(void);
 extern char *get_index_file(void);
 extern char *get_object_directory(void);
 extern char *get_refs_directory(void);
 extern char *get_index_file(void);

diff --git a/fsck-objects.c b/fsck-objects.c
index 6cb0f29be8a1eed5c22c90894560e399aa537f56..b82685fd718b0269bee4153badd391e9218a2b29 100644 (file)
--- a/fsck-objects.c
+++ b/fsck-objects.c
@@ -406,10 +406,7 @@ static int fsck_head_link(void)
        char hex[40];
        unsigned char sha1[20];
        static char path[PATH_MAX], link[PATH_MAX];
        char hex[40];
        unsigned char sha1[20];
        static char path[PATH_MAX], link[PATH_MAX];

-       const char *git_dir;
-
-       git_dir = getenv(GIT_DIR_ENVIRONMENT);
-       if (!git_dir) git_dir = DEFAULT_GIT_DIR_ENVIRONMENT;
+       const char *git_dir = get_git_dir();

 
        snprintf(path, sizeof(path), "%s/HEAD", git_dir);
        if (readlink(path, link, sizeof(link)) < 0)
 
        snprintf(path, sizeof(path), "%s/HEAD", git_dir);
        if (readlink(path, link, sizeof(link)) < 0)

diff --git a/path.c b/path.c
index f788028a63dbd9b34563d2589697f4b5d65b8648..495d17ca4ca371f4b5bdb6f1f3de9a6a9d84280b 100644 (file)
--- a/path.c
+++ b/path.c
@@ -41,12 +41,10 @@ char *mkpath(const char *fmt, ...)
 
 char *git_path(const char *fmt, ...)
 {
 
 char *git_path(const char *fmt, ...)
 {

-       const char *git_dir;
+       const char *git_dir = get_git_dir();

        va_list args;
        unsigned len;
 
        va_list args;
        unsigned len;
 

-       git_dir = getenv(GIT_DIR_ENVIRONMENT);
-       if (!git_dir) git_dir = DEFAULT_GIT_DIR_ENVIRONMENT;

        len = strlen(git_dir);
        if (len > PATH_MAX-100)
                return bad_path;
        len = strlen(git_dir);
        if (len > PATH_MAX-100)
                return bad_path;

diff --git a/sha1_file.c b/sha1_file.c
index 66382027816e8ec3a97c40f6849c62454f2ad0f2..fe374c6132a74641959e201f8c03dd9952e9acee 100644 (file)
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -70,6 +70,13 @@ static void setup_git_env(void)
                git_graft_file = strdup(git_path("info/grafts"));
 }
 
                git_graft_file = strdup(git_path("info/grafts"));
 }
 

+char *get_git_dir(void)
+{
+       if (!git_dir)
+               setup_git_env();
+       return git_dir;
+}
+

 char *get_object_directory(void)
 {
        if (!git_object_dir)
 char *get_object_directory(void)
 {
        if (!git_object_dir)