summaryrefslogtreecommitdiffstats
path: root/camping/gitweb.rb
diff options
context:
space:
mode:
authorscott Chacon <schacon@agadorsparticus.(none)>2007-11-27 08:21:28 -0800
committerscott Chacon <schacon@agadorsparticus.(none)>2007-11-27 08:21:28 -0800
commit6a9db968e8563bc27b8f56f9d413159a2e14cf67 (patch)
tree5094084caae36283763eba7a1965f93ad159608a /camping/gitweb.rb
parent07ebb951368ed31bdaebc2e820c62ced22c8bbe4 (diff)
downloadthird_party-ruby-git-6a9db968e8563bc27b8f56f9d413159a2e14cf67.tar.gz
third_party-ruby-git-6a9db968e8563bc27b8f56f9d413159a2e14cf67.tar.xz
third_party-ruby-git-6a9db968e8563bc27b8f56f9d413159a2e14cf67.zip
fixed issue with running a 'git log' with an object that won't rev-parse (file)
Diffstat (limited to 'camping/gitweb.rb')
-rw-r--r--camping/gitweb.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/camping/gitweb.rb b/camping/gitweb.rb
index 3d1b5d6..29a4ab3 100644
--- a/camping/gitweb.rb
+++ b/camping/gitweb.rb
@@ -116,10 +116,7 @@ module GitWeb::Controllers
class Tree < R '/tree/(\d+)/(\w+)'
def get repo_id, sha
@repo = Repository.find repo_id
- logger = Logger.new('/tmp/git.log')
- logger.level = Logger::INFO
-
- @git = Git.bare(@repo.path, :log => logger)
+ @git = Git.bare(@repo.path)
@tree = @git.gtree(sha)
render :tree
end
@@ -128,7 +125,10 @@ module GitWeb::Controllers
class Blob < R '/blob/(\d+)/(.*?)/(\w+)'
def get repo_id, file, sha
@repo = Repository.find repo_id
- @git = Git.bare(@repo.path)
+ logger = Logger.new('/tmp/git.log')
+ logger.level = Logger::INFO
+
+ @git = Git.bare(@repo.path, :log => logger)
@blob = @git.gblob(sha)
@file = file
render :blob