diff options
| author | James Moger <james.moger@gitblit.com> | 2012-03-28 17:57:35 -0400 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2012-03-28 17:57:35 -0400 |
| commit | 1aa6e081ffe319ff3ddfa246783cb65dc1c71b3b (patch) | |
| tree | 15642ada937c47daf052a750807d7566c3216d70 /src/com/gitblit/GitServlet.java | |
| parent | 6fdbc6b5bdb805d1faefe3f26105d5adfa37d5a1 (diff) | |
| download | gitblit-1aa6e081ffe319ff3ddfa246783cb65dc1c71b3b.tar.gz gitblit-1aa6e081ffe319ff3ddfa246783cb65dc1c71b3b.zip | |
Fixed symlink absolute path/canonical path mixup with JGit (issue 78)
Diffstat (limited to 'src/com/gitblit/GitServlet.java')
| -rw-r--r-- | src/com/gitblit/GitServlet.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/com/gitblit/GitServlet.java b/src/com/gitblit/GitServlet.java index 3b60e9f1..73c6eaa4 100644 --- a/src/com/gitblit/GitServlet.java +++ b/src/com/gitblit/GitServlet.java @@ -50,6 +50,7 @@ import org.slf4j.LoggerFactory; import com.gitblit.models.RepositoryModel;
import com.gitblit.models.UserModel;
+import com.gitblit.utils.FileUtils;
import com.gitblit.utils.HttpUtils;
import com.gitblit.utils.StringUtils;
@@ -207,9 +208,7 @@ public class GitServlet extends org.eclipse.jgit.http.server.GitServlet { */
protected RepositoryModel getRepositoryModel(ReceivePack rp) {
Repository repository = rp.getRepository();
- String rootPath = GitBlit.getRepositoriesFolder().getAbsolutePath();
- String repositoryName = StringUtils.getRelativePath(rootPath, repository.getDirectory()
- .getAbsolutePath());
+ String repositoryName = FileUtils.getRelativePath(GitBlit.getRepositoriesFolder(), repository.getDirectory());
RepositoryModel model = GitBlit.self().getRepositoryModel(repositoryName);
return model;
}
|