mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
setup_git_env(): introduce git_path_from_env() helper
"Check the value of an environment and fall back to a known path inside $GIT_DIR" is repeated a few times to determine the location of the data store, the index and the graft file, but the return value of getenv is not guaranteed to survive across further invocations of setenv or even getenv. Make sure to xstrdup() the value we receive from getenv(3), and encapsulate the pattern into a helper function. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
45bc131dd3
commit
cb6c38d5cc
|
@ -124,6 +124,12 @@ static char *expand_namespace(const char *raw_namespace)
|
||||||
return strbuf_detach(&buf, NULL);
|
return strbuf_detach(&buf, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static char *git_path_from_env(const char *envvar, const char *path)
|
||||||
|
{
|
||||||
|
const char *value = getenv(envvar);
|
||||||
|
return value ? xstrdup(value) : git_pathdup("%s", path);
|
||||||
|
}
|
||||||
|
|
||||||
static void setup_git_env(void)
|
static void setup_git_env(void)
|
||||||
{
|
{
|
||||||
const char *gitfile;
|
const char *gitfile;
|
||||||
|
@ -134,15 +140,9 @@ static void setup_git_env(void)
|
||||||
git_dir = DEFAULT_GIT_DIR_ENVIRONMENT;
|
git_dir = DEFAULT_GIT_DIR_ENVIRONMENT;
|
||||||
gitfile = read_gitfile(git_dir);
|
gitfile = read_gitfile(git_dir);
|
||||||
git_dir = xstrdup(gitfile ? gitfile : git_dir);
|
git_dir = xstrdup(gitfile ? gitfile : git_dir);
|
||||||
git_object_dir = getenv(DB_ENVIRONMENT);
|
git_object_dir = git_path_from_env(DB_ENVIRONMENT, "objects");
|
||||||
if (!git_object_dir)
|
git_index_file = git_path_from_env(INDEX_ENVIRONMENT, "index");
|
||||||
git_object_dir = git_pathdup("objects");
|
git_graft_file = git_path_from_env(GRAFT_ENVIRONMENT, "info/grafts");
|
||||||
git_index_file = getenv(INDEX_ENVIRONMENT);
|
|
||||||
if (!git_index_file)
|
|
||||||
git_index_file = git_pathdup("index");
|
|
||||||
git_graft_file = getenv(GRAFT_ENVIRONMENT);
|
|
||||||
if (!git_graft_file)
|
|
||||||
git_graft_file = git_pathdup("info/grafts");
|
|
||||||
if (getenv(NO_REPLACE_OBJECTS_ENVIRONMENT))
|
if (getenv(NO_REPLACE_OBJECTS_ENVIRONMENT))
|
||||||
check_replace_refs = 0;
|
check_replace_refs = 0;
|
||||||
namespace = expand_namespace(getenv(GIT_NAMESPACE_ENVIRONMENT));
|
namespace = expand_namespace(getenv(GIT_NAMESPACE_ENVIRONMENT));
|
||||||
|
|
Loading…
Reference in a new issue