diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-08-28 21:20:28 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-28 21:20:28 -0700 |
| commit | 2730f55527143d3476c159cebbdb63d5e6a5c2a8 (patch) | |
| tree | c57fde5c543baa16074b1167dbd4d646734e5b8c /setup.c | |
| parent | 1da6d98a9acd2db3902bf432a097771c76f4fd44 (diff) | |
| parent | 9b0ebc722cfc12bd14934aab5cf77ebe654e36e6 (diff) | |
| download | git-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 'setup.c')
| -rw-r--r-- | setup.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -379,7 +379,7 @@ static int check_repository_format_gently(const char *gitdir, int *nongit_ok) * Try to read the location of the git directory from the .git file, * return path to git directory if found. */ -const char *read_gitfile_gently(const char *path) +const char *read_gitfile(const char *path) { char *buf; char *dir; @@ -441,7 +441,7 @@ static const char *setup_explicit_git_dir(const char *gitdirenv, if (PATH_MAX - 40 < strlen(gitdirenv)) die("'$%s' too big", GIT_DIR_ENVIRONMENT); - gitfile = (char*)read_gitfile_gently(gitdirenv); + gitfile = (char*)read_gitfile(gitdirenv); if (gitfile) { gitfile = xstrdup(gitfile); gitdirenv = gitfile; @@ -665,7 +665,7 @@ static const char *setup_git_directory_gently_1(int *nongit_ok) if (one_filesystem) current_device = get_device_or_die(".", NULL); for (;;) { - gitfile = (char*)read_gitfile_gently(DEFAULT_GIT_DIR_ENVIRONMENT); + gitfile = (char*)read_gitfile(DEFAULT_GIT_DIR_ENVIRONMENT); if (gitfile) gitdirenv = gitfile = xstrdup(gitfile); else { |