summaryrefslogtreecommitdiff
path: root/path.c
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2015-09-28 20:06:14 +0700
committerJunio C Hamano <gitster@pobox.com>2015-09-28 10:46:33 -0700
commit1f5fbe1fe2d04f6386cf8febc1ce308bcf815592 (patch)
tree9d3691b5bcd0b1e8c47318786024dd8b25af5ea6 /path.c
parent0f64cc407f32f979c8bcfa7d3d9b24d8e023df35 (diff)
downloadgit-1f5fbe1fe2d04f6386cf8febc1ce308bcf815592.tar.gz
enter_repo: allow .git files in strict mode
Strict mode is about not guessing where .git is. If the user points to a .git file, we know exactly where the target .git dir will be. This makes it possible to serve .git files as repository on the server side. This may be needed even in local clone case because transport.c code uses upload-pack for fetching remote refs. But right now the clone/transport code goes with non-strict. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'path.c')
-rw-r--r--path.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/path.c b/path.c
index 7340e11d7d..a346134462 100644
--- a/path.c
+++ b/path.c
@@ -438,8 +438,13 @@ const char *enter_repo(const char *path, int strict)
return NULL;
path = validated_path;
}
- else if (chdir(path))
- return NULL;
+ else {
+ const char *gitfile = read_gitfile(path);
+ if (gitfile)
+ path = gitfile;
+ if (chdir(path))
+ return NULL;
+ }
if (is_git_directory(".")) {
set_git_dir(".");