diff options
| author | James Moger <james.moger@gitblit.com> | 2012-01-09 20:49:34 -0500 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2012-01-09 20:49:34 -0500 |
| commit | 11924dc5db4bc44cb32e905700a8557124b1fd56 (patch) | |
| tree | 610fbdf40ef312a5b2512864ae381838efa38e11 /src/com/gitblit/GitBlit.java | |
| parent | 6d874a0cb27092a1c7c3eae3dfe660ffcd8d48e6 (diff) | |
| download | gitblit-11924dc5db4bc44cb32e905700a8557124b1fd56.tar.gz gitblit-11924dc5db4bc44cb32e905700a8557124b1fd56.zip | |
Support for gh-pages branch serving as /pages/repo.git
Diffstat (limited to 'src/com/gitblit/GitBlit.java')
| -rw-r--r-- | src/com/gitblit/GitBlit.java | 29 |
1 files changed, 23 insertions, 6 deletions
diff --git a/src/com/gitblit/GitBlit.java b/src/com/gitblit/GitBlit.java index ce3e16d6..2448f7ae 100644 --- a/src/com/gitblit/GitBlit.java +++ b/src/com/gitblit/GitBlit.java @@ -653,21 +653,38 @@ public class GitBlit implements ServletContextListener { * @return repository or null
*/
public Repository getRepository(String repositoryName) {
+ return getRepository(repositoryName, true);
+ }
+
+ /**
+ * Returns the JGit repository for the specified name.
+ *
+ * @param repositoryName
+ * @param logError
+ * @return repository or null
+ */
+ public Repository getRepository(String repositoryName, boolean logError) {
Repository r = null;
try {
r = repositoryResolver.open(null, repositoryName);
} catch (RepositoryNotFoundException e) {
r = null;
- logger.error("GitBlit.getRepository(String) failed to find "
- + new File(repositoriesFolder, repositoryName).getAbsolutePath());
+ if (logError) {
+ logger.error("GitBlit.getRepository(String) failed to find "
+ + new File(repositoriesFolder, repositoryName).getAbsolutePath());
+ }
} catch (ServiceNotAuthorizedException e) {
r = null;
- logger.error("GitBlit.getRepository(String) failed to find "
- + new File(repositoriesFolder, repositoryName).getAbsolutePath(), e);
+ if (logError) {
+ logger.error("GitBlit.getRepository(String) failed to find "
+ + new File(repositoriesFolder, repositoryName).getAbsolutePath(), e);
+ }
} catch (ServiceNotEnabledException e) {
r = null;
- logger.error("GitBlit.getRepository(String) failed to find "
- + new File(repositoriesFolder, repositoryName).getAbsolutePath(), e);
+ if (logError) {
+ logger.error("GitBlit.getRepository(String) failed to find "
+ + new File(repositoriesFolder, repositoryName).getAbsolutePath(), e);
+ }
}
return r;
}
|