diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-09-23 14:21:39 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-09-23 14:21:39 -0700 |
| commit | 406c1c4dd4a8f0fac3fddce1e7bb3b66af835e6a (patch) | |
| tree | fdf9a1740fb73a40c0aee0f23d79792ea171f289 /environment.c | |
| parent | Merge branch 'mh/check-ref-format-print-normalize' into maint (diff) | |
| parent | clone: allow to clone from .git file (diff) | |
| download | tgif-406c1c4dd4a8f0fac3fddce1e7bb3b66af835e6a.tar.xz | |
Merge branch 'nd/maint-clone-gitdir' into maint
* 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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/environment.c b/environment.c index 94d58fd244..2228c4e9a1 100644 --- a/environment.c +++ b/environment.c @@ -91,7 +91,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) |