summaryrefslogtreecommitdiff
path: root/refs.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 /refs.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 'refs.c')
-rw-r--r--refs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/refs.c b/refs.c
index 6f313a9e0c..e5b2b1ac2b 100644
--- a/refs.c
+++ b/refs.c
@@ -451,7 +451,7 @@ int resolve_gitlink_ref(const char *path, const char *refname, unsigned char *re
memcpy(gitdir + len, "/.git", 6);
len += 5;
- tmp = read_gitfile_gently(gitdir);
+ tmp = read_gitfile(gitdir);
if (tmp) {
free(gitdir);
len = strlen(tmp);