Nemcio/GitList
1
0
Fork 0
mirror of https://github.com/klaussilveira/gitlist.git synced 2026-03-23 21:00:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #208

Browse Source
This commit is contained in:
Klaus Silveira
2013-01-18 13:34:29 -02:00
parent 14420d4380
commit ab7ffc181b
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/GitList/Util/Repository.php
View File

@@ -200,25 +200,23 @@ class Repository
$branch = $matches[1];
} else {
// Otherwise, attempt to detect the ref using a list of the project's branches and tags
$valid_refs = array_merge((array) $repository->getBranches(), (array) $repository->getTags());
foreach ($valid_refs as $k => $v) {
if (!preg_match(sprintf("#^%s/#", preg_quote($v, '#')), $input)) {
unset($valid_refs[$k]);
$validRefs = array_merge((array) $repository->getBranches(), (array) $repository->getTags());
foreach ($validRefs as $key => $ref) {
if (!preg_match(sprintf("#^%s/#", preg_quote($ref, '#')), $input)) {
unset($validRefs[$key]);
}
}
// No exact ref match, so just try our best
if (count($valid_refs) > 1) {
if (count($validRefs) > 1) {
preg_match('/([^\/]+)(.*)/', $input, $matches);
$branch = preg_replace('/^\/|\/$/', '', $matches[1]);
} else {
// Extract branch name
$branch = array_shift($valid_refs);
$branch = array_shift($validRefs);
}
}
$tree = trim(str_replace($branch, "", $input), "/");
return array($branch, $tree);
}