From: Martin Atukunda Date: Tue, 22 Nov 2005 00:28:12 GMT Subject: [PATCH 3/6] Make get_git_dir take a flag that makes it re-read the env. variables Message-ID: <11326192923683-git-send-email-matlads@dsmagic.com> In-Reply-To: <11326192921291-git-send-email-matlads@dsmagic.com> Signed-Off-By: Martin Atukunda --- cache.h | 2 +- environment.c | 4 ++-- path.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) applies-to: 0748fd804fbe155503235e2c36d812fc3ef641a0 e3973791e841440ad92d91340fd954b5a58101c7 diff --git a/cache.h b/cache.h index 54c283d..a455373 100644 --- a/cache.h +++ b/cache.h @@ -138,7 +138,7 @@ extern unsigned int active_nr, active_al #define INDEX_ENVIRONMENT "GIT_INDEX_FILE" #define GRAFT_ENVIRONMENT "GIT_GRAFT_FILE" -extern char *get_git_dir(void); +extern char *get_git_dir(int recheck_env); extern char *get_object_directory(void); extern char *get_refs_directory(void); extern char *get_index_file(void); diff --git a/environment.c b/environment.c index 3f19473..6a961ca 100644 --- a/environment.c +++ b/environment.c @@ -39,9 +39,9 @@ static void setup_git_env(void) git_graft_file = strdup(git_path("info/grafts")); } -char *get_git_dir(void) +char *get_git_dir(int recheck_env) { - if (!git_dir) + if (!git_dir || recheck_env) setup_git_env(); return git_dir; } diff --git a/path.c b/path.c index 4d88947..e322dc0 100644 --- a/path.c +++ b/path.c @@ -42,7 +42,7 @@ char *mkpath(const char *fmt, ...) char *git_path(const char *fmt, ...) { - const char *git_dir = get_git_dir(); + const char *git_dir = get_git_dir(0); va_list args; unsigned len; --- 0.99.9.GIT