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 /setup.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 'setup.c')
| -rw-r--r-- | setup.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -375,7 +375,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; @@ -437,7 +437,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; @@ -661,7 +661,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 { |