From 343fc2f8cc69d4411fbf1a00240b262031a815f4 Mon Sep 17 00:00:00 2001 From: Klaus Silveira Date: Fri, 1 Jun 2012 02:56:39 -0300 Subject: [PATCH] Adding support for blame and commit history on bare repositories. Fixes #7, thanks @nifisher --- controllers/commitController.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/controllers/commitController.php b/controllers/commitController.php index 1d1f9c7..0427c68 100644 --- a/controllers/commitController.php +++ b/controllers/commitController.php @@ -27,8 +27,8 @@ $app->get('{repo}/commits/{branch}', function($repo, $branch) use($app) { $app->get('{repo}/commits/{branch}/{file}/', function($repo, $branch, $file) use($app) { $repository = $app['git']->getRepository($app['git.repos'] . $repo); - $pager = $app['utils']->getPager($app['request']->get('page'), $repository->getTotalCommits($file)); - $commits = $repository->getCommits($file, $pager['current']); + $pager = $app['utils']->getPager($app['request']->get('page'), $repository->getTotalCommits("$branch -- $file")); + $commits = $repository->getCommits("$branch -- $file", $pager['current']); foreach ($commits as $commit) { $date = $commit->getDate(); @@ -66,7 +66,7 @@ $app->get('{repo}/commit/{commit}/', function($repo, $commit) use($app) { $app->get('{repo}/blame/{branch}/{file}/', function($repo, $branch, $file) use($app) { $repository = $app['git']->getRepository($app['git.repos'] . $repo); - $blames = $repository->getBlame($file); + $blames = $repository->getBlame("$branch -- $file"); return $app['twig']->render('blame.twig', array( 'baseurl' => $app['baseurl'],