From 2f6103053427faec81c58d136bac7e1c083cf28a Mon Sep 17 00:00:00 2001
From: Mike Gelfand <mike.gelfand@iaso.com>
Date: Thu, 31 Jul 2014 13:16:32 +0300
Subject: [PATCH] Take branch into account when searching for commit

---
 src/GitList/Controller/CommitController.php | 2 +-
 src/GitList/Git/Repository.php              | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

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
             . "<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);