diff --git a/src/GitList/Controller/CommitController.php b/src/GitList/Controller/CommitController.php index 292e94c..c7d9bd2 100644 --- a/src/GitList/Controller/CommitController.php +++ b/src/GitList/Controller/CommitController.php @@ -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) { diff --git a/src/GitList/Git/Repository.php b/src/GitList/Git/Repository.php index 08787c8..e633e83 100644 --- a/src/GitList/Git/Repository.php +++ b/src/GitList/Git/Repository.php @@ -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 . "%at%cn" . "%ce" . "%ct" - . "\""; + . "\"" + . " $branch"; try { $logs = $this->getPrettyFormat($command);