[PATCH 2/4] Learn to handle gitfiles in enter_repo
- From
Phil Hord <phil.hord@gmail.com>
- Date
- Oct 4, 2011, 20:05 UTC
- Message-ID
- <CABURp0r7o8Mq4RyjEac18syU3HwCXWm7FOe+Mu0PshVXddJwuA@mail.gmail.com>
The enter_repo() function is used to navigate into a .git directory. It knows how to find standard alternatives (DWIM) but it doesn't handle gitfiles created by git init --separate-git-dir. This means that git-fetch and others do not work with repositories using the separate-git-dir mechanism.
Teach enter_repo() to deal with the gitfile mechanism by resolving the path to the redirected path and continuing tests on that path instead of the found file.
Signed-off-by: Phil Hord <hordp@cisco.com> ---
This change allows enter_repo to work with gitfiles, but another change is required to teach transport.c to recognize gitfiles as git-dirs.
diff --git a/path.c b/path.c index 01028f2..b6f71d1 100644 --- a/path.c +++ b/path.c @@ -295,6 +295,7 @@ const char *enter_repo(const char *path, int strict) static const char *suffix[] = { ".git/.git", "/.git", ".git", "", NULL, }; + const char *gitfile; int len = strlen(path); int i; while ((1 < len) && (path[len-1] == '/')) @@ -329,7 +330,12 @@ const char *enter_repo(const char *path, int strict) break; } } - if (!suffix[i] || chdir(used_path)) + if (!suffix[i]) + return NULL; + gitfile = read_gitfile(used_path) ; + if (gitfile) + strcpy(used_path, gitfile); + if (chdir(used_path)) return NULL; path = validated_path; }
-- 1.7.7.503.g26392.dirty