Nemcio/GitList
1
0
Fork 0
mirror of https://github.com/klaussilveira/gitlist.git synced 2025-11-18 03:30:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix for #61, #62

Browse Source
This commit is contained in:
Peter Droogmans
2012-06-27 14:43:46 +02:00
parent ec2e12dc04
commit 22a81468d5
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
controllers/treeController.php
View File

@@ -17,7 +17,7 @@ $app->get('{repo}/', function($repo) use($app) {
'breadcrumbs' => $breadcrumbs, 'breadcrumbs' => $breadcrumbs,
'branches' => $repository->getBranches(), 'branches' => $repository->getBranches(),
'tags' => $repository->getTags(), 'tags' => $repository->getTags(),
'readme' => $app['utils']->getReadme($repo), 'readme' => $app['utils']->getReadme($repo, $defaultBranch),
)); ));
})->assert('repo', '[\w-._]+'); })->assert('repo', '[\w-._]+');

4
lib/Application/Utils.php
View File

@@ -249,7 +249,7 @@ class Utils
public function getReadme($repo, $branch = 'master') public function getReadme($repo, $branch = 'master')
{ {
$repository = $this->app['git']->getRepository($this->app['git.repos'] . $repo); $repository = $this->app['git']->getRepository($this->app['git.repos'] . $repo);
$files = $repository->getTree('master')->output(); $files = $repository->getTree($branch)->output();
foreach ($files as $fileInfo) foreach ($files as $fileInfo)
if (preg_match('/^readme*/i', $fileInfo['name'])) { if (preg_match('/^readme*/i', $fileInfo['name'])) {
@@ -257,4 +257,4 @@ class Utils
} }
return array(); return array();
} }
} }

3
lib/Git/Repository.php
View File

@@ -414,6 +414,9 @@ class Repository
public function getHead() public function getHead()
{ {
$file = file_get_contents($this->getPath() . '/.git/HEAD'); $file = file_get_contents($this->getPath() . '/.git/HEAD');
if ($file === FALSE) {
$file = file_get_contents($this->getPath() . '/HEAD');
}
foreach (explode("\n", $file) as $line) { foreach (explode("\n", $file) as $line) {
$m = array(); $m = array();
if (preg_match('#ref:\srefs/heads/(.+)#', $line, $m)) { if (preg_match('#ref:\srefs/heads/(.+)#', $line, $m)) {