Nemcio/GitList
1
0
Fork 0
mirror of https://github.com/klaussilveira/gitlist.git synced 2026-07-05 10:27:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Take branch into account when searching for commit

Browse Source
This commit is contained in:
Mike Gelfand
2014-07-31 13:16:32 +03:00
parent 6c99ffee4c
commit 2f61030534
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/GitList/Controller/CommitController.php
View File

@@ -68,7 +68,7 @@ class CommitController implements ControllerProviderInterface
$repository = $app['git']->getRepositoryFromName($app['git.repos'], $repo);
$query = $request->get('query');
$commits = $repository->searchCommitLog($request->get('query'));
$commits = $repository->searchCommitLog($query, $branch);
$categorized = array();
foreach ($commits as $commit) {

5
src/GitList/Git/Repository.php
View File

@@ -238,7 +238,7 @@ class Repository extends BaseRepository
return $commits;
}
public function searchCommitLog($query)
public function searchCommitLog($query, $branch)
{
$query = escapeshellarg($query);
$query = strtr($query, array('[' => '\\[', ']' => '\\]'));
@@ -249,7 +249,8 @@ class Repository extends BaseRepository
. "<date>%at</date><commiter>%cn</commiter>"
. "<commiter_email>%ce</commiter_email>"
. "<commiter_date>%ct</commiter_date>"
. "<message><![CDATA[%s]]></message></item>\"";
. "<message><![CDATA[%s]]></message></item>\""
. " $branch";
try {
$logs = $this->getPrettyFormat($command);