summaryrefslogtreecommitdiff
path: root/environment.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-08-28 21:20:28 -0700
committerJunio C Hamano <gitster@pobox.com>2011-08-28 21:20:28 -0700
commit2730f55527143d3476c159cebbdb63d5e6a5c2a8 (patch)
treec57fde5c543baa16074b1167dbd4d646734e5b8c /environment.c
parent1da6d98a9acd2db3902bf432a097771c76f4fd44 (diff)
parent9b0ebc722cfc12bd14934aab5cf77ebe654e36e6 (diff)
downloadgit-2730f55527143d3476c159cebbdb63d5e6a5c2a8.tar.gz
Merge branch 'nd/maint-clone-gitdir'
* nd/maint-clone-gitdir: clone: allow to clone from .git file read_gitfile_gently(): rename misnamed function to read_gitfile()
Diffstat (limited to 'environment.c')
-rw-r--r--environment.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/environment.c b/environment.c
index 03d29e8d48..e96edcfebc 100644
--- a/environment.c
+++ b/environment.c
@@ -117,7 +117,7 @@ static void setup_git_env(void)
git_dir = getenv(GIT_DIR_ENVIRONMENT);
git_dir = git_dir ? xstrdup(git_dir) : NULL;
if (!git_dir) {
- git_dir = read_gitfile_gently(DEFAULT_GIT_DIR_ENVIRONMENT);
+ git_dir = read_gitfile(DEFAULT_GIT_DIR_ENVIRONMENT);
git_dir = git_dir ? xstrdup(git_dir) : NULL;
}
if (!git_dir)