--- a/app/controllers/browse_controller.rb
+++ b/app/controllers/browse_controller.rb
@@ -7,34 +7,24 @@ class BrowseController < ApplicationController
   def index
     @git = Gitorious::Gitto.new(@repository.full_repository_path)
     @commits = @git.log(LOGS_PER_PAGE)
+    @tags_per_sha = @git.tags_by_sha
+    # TODO: Patch rails to keep track of what it responds to so we can DRY this up
+    @atom_auto_discovery_url = project_repository_formatted_browse_path(@project, @repository, :atom)
+    respond_to do |format|
+      format.html
+      format.atom
+    end
   end
   
-  # def index
-  #   @git = Git.bare(@repository.full_repository_path)
-  #   @commits = @git.log(LOGS_PER_PAGE)
-  #   @tags_per_sha = returning({}) do |hash|
-  #     @git.tags.each do |tag| 
-  #       hash[tag.sha] ||= []
-  #       hash[tag.sha] << tag.name 
-  #     end
-  #   end
-  #   # TODO: Patch rails to keep track of what it responds to so we can DRY this up
-  #   @atom_auto_discovery_url = project_repository_formatted_browse_path(@project, @repository, :atom)
-  #   respond_to do |format|
-  #     format.html
-  #     format.atom
-  #   end
-  # end
-  
   def tree
-    @git = Git.bare(@repository.full_repository_path)   
-    @tree = @git.gtree(params[:sha])
+    @git = Gitorious::Gitto.new(@repository.full_repository_path)   
+    @tree = @git.tree(params[:sha])
   end
   
   def commit
     @diffmode = params[:diffmode] == "sidebyside" ? "sidebyside" : "inline"
-    @git = Git.bare(@repository.full_repository_path)
-    @commit = @git.gcommit(params[:sha])
+    @git = Gitorious::Gitto.new(@repository.full_repository_path)
+    @commit = @git.commit(params[:sha])
     if @commit.parent
       @diff = @git.diff(@commit.parent.sha || "", @commit.sha)
     else
@@ -45,31 +35,26 @@ class BrowseController < ApplicationController
   end
   
   def diff
-    @git = Git.bare(@repository.full_repository_path)
+    @git = Gitorious::Gitto.new(@repository.full_repository_path)
     @diff = @git.diff(params[:sha], params[:other_sha])
   end
   
   def blob
-    @git = Git.bare(@repository.full_repository_path)
-    @blob = @git.gblob(params[:sha])
+    @git = Gitorious::Gitto.new(@repository.full_repository_path)
+    @blob = @git.blob(params[:sha])
   end
   
   def raw
-    @git = Git.bare(@repository.full_repository_path)
-    @blob = @git.gblob(params[:sha])
+    @git = Gitorious::Gitto.new(@repository.full_repository_path)
+    @blob = @git.blob(params[:sha])
     render :text => @blob.contents, :content_type => "text/plain"
   end
   
   def log
-    @git = Git.bare(@repository.full_repository_path)
+    @git = Gitorious::Gitto.new(@repository.full_repository_path)
     skip = params[:page].blank? ? 0 : (params[:page].to_i-1) * LOGS_PER_PAGE
     @commits = @git.log(LOGS_PER_PAGE, skip)
-    @tags_per_sha = returning({}) do |hash|
-      @git.tags.each do |tag| 
-        hash[tag.sha] ||= []
-        hash[tag.sha] << tag.name 
-      end
-    end
+    @tags_per_sha = @git.tags_by_sha
     # TODO: Patch rails to keep track of what it responds to so we can DRY this up
     @atom_auto_discovery_url = project_repository_formatted_browse_path(@project, @repository, :atom)
     respond_to do |format|

--- a/lib/gitorious/gitto.rb
+++ b/lib/gitorious/gitto.rb
@@ -40,7 +40,16 @@ module Gitorious
       
       def tags
         @git.tags
-      end    
+      end
+      
+      def tags_by_sha
+        tags_by_sha = {}
+        tags.each do |tag| 
+          tags_by_sha[tag.sha] ||= []
+          tags_by_sha[tag.sha] << tag.name 
+        end
+        tags_by_sha
+      end
       
       def remotes
         @git.remotes

--- a/spec/controllers/browse_controller_spec.rb
+++ b/spec/controllers/browse_controller_spec.rb
@@ -2,7 +2,6 @@ require File.dirname(__FILE__) + '/../spec_helper'
 
 describe BrowseController do
   before(:each) do
-    login_as :johan
     @project = projects(:johans)
     @repository = @project.repositories.first
     
@@ -12,14 +11,13 @@ describe BrowseController do
       .with(@repository.name).and_return(@repository)
     @repository.stub!(:has_commits?).and_return(true)
     
-    @git_mock = mock("Git mock", :null_object => true)
+    @gitto = mock("Gitto mock", :null_object => true)
     Gitorious::Gitto.should_receive(:new) \
       .with(@repository.full_repository_path) \
-      .and_return(@git_mock)
+      .and_return(@gitto)
   end
   
-  describe "index" do
-
+  describe "#index" do
     def do_get
       get :index, :project_id => @project.slug, :repository_id => @repository.name
     end
@@ -31,15 +29,147 @@ describe BrowseController do
     end
     
     it "fetches the specified log entries" do
-      @git_mock.should_receive(:log).with(BrowseController::LOGS_PER_PAGE).and_return(commits=mock("logentrues"))
+      @gitto.should_receive(:log).with(BrowseController::LOGS_PER_PAGE) \
+        .and_return(commits=mock("logentrues"))
       do_get
       assigns[:commits].should == commits
     end    
     
     it "assigns the tags for easy lookup" do
-      @git_mock.should_receive(:log).with(BrowseController::LOGS_PER_PAGE).and_return(commits=mock("logentrues"))
+      @gitto.should_receive(:log).with(BrowseController::LOGS_PER_PAGE) \
+        .and_return(mock("logentrues"))
+      @gitto.should_receive(:tags_by_sha).and_return({"foo" => ["bar"]})
+      do_get
+      assigns[:tags_per_sha].should == {"foo" => ["bar"]}
+    end
+  end
+  
+  describe "#tree" do
+    it "GETs successfully" do
+      tree_mock = mock("gtree")
+      @gitto.should_receive(:tree).and_return(tree_mock)
+      get :tree, :project_id => @project.slug, 
+        :repository_id => @repository.name, :sha => "a"*40
+        
+      response.should be_success
+      assigns[:git].should == @gitto
+      assigns[:tree].should == tree_mock
+    end
+  end
+  
+  describe "#commit" do    
+    before(:each) do
+      @commit_mock = mock("commit")
+      @commit_mock.stub!(:sha).and_return("a"*40)
+      @commit_mock.stub!(:parent).and_return(@commit_mock)
+      @diff_mock = mock("diff")
+      @gitto.should_receive(:diff).with(@commit_mock.parent.sha, 
+        @commit_mock.sha).and_return(@diff_mock)
+      @gitto.should_receive(:commit).with("a"*40).and_return(@commit_mock)
+    end
+    def do_get(opts={})
+      get :commit, {:project_id => @project.slug, 
+          :repository_id => @repository.name, :sha => "a"*40}.merge(opts)
+    end
+    it "gets the commit data" do
+      do_get
+      response.should be_success
+      assigns[:git].should == @gitto
+      assigns[:commit].should == @commit_mock
+      assigns[:diff].should == @diff_mock
+    end
+    
+    it "gets the comments for the commit" do
+      do_get
+      assigns[:comment_count].should == 0
+    end
+    
+    it "defaults to 'inline' diffmode" do
+      do_get
+      assigns[:diffmode].should == "inline"
+    end
+    
+    it "sets sidebyside diffmode" do
+      do_get(:diffmode => "sidebyside")
+      assigns[:diffmode].should == "sidebyside"
+    end
+  end
+  
+  describe "#diff" do
+    it "diffs the sha's provided" do
+      diff_mock = mock("diff")
+      @gitto.should_receive(:diff).with("a"*40, "b"*40).and_return(diff_mock)
+      
+      get :diff, {:project_id => @project.slug, 
+          :repository_id => @repository.name, :sha => "a"*40, :other_sha => "b"*40}
+      
+      response.should be_success
+      assigns[:git].should == @gitto
+      assigns[:diff].should == diff_mock
+    end
+  end
+  
+  describe "#blob" do
+    it "gets the blob data for the sha provided" do
+      blob_mock = mock("blob")
+      @gitto.should_receive(:blob).with("a"*40).and_return(blob_mock)
+      
+      get :blob, {:project_id => @project.slug, 
+          :repository_id => @repository.name, :sha => "a"*40}
+      
+      response.should be_success
+      assigns[:git].should == @gitto
+      assigns[:blob].should == blob_mock
+    end    
+  end
+  
+  describe "#raw" do
+    it "gets the blob data from the sha and renders it as text/plain" do
+      blob_mock = mock("blob")
+      blob_mock.stub!(:contents).and_return("blabla")
+      @gitto.should_receive(:blob).with("a"*40).and_return(blob_mock)
+      
+      get :raw, {:project_id => @project.slug, 
+          :repository_id => @repository.name, :sha => "a"*40}
+      
+      response.should be_success
+      assigns[:git].should == @gitto
+      assigns[:blob].should == blob_mock
+      response.body.should == "blabla"
+      response.content_type.should == "text/plain"
+    end
+  end
+  
+  describe "#log" do
+    def do_get(opts = {})
+      get :log, {:project_id => @project.slug, 
+        :repository_id => @repository.name, :page => nil}.merge(opts)
+    end
+    
+    it "GETs page 1 successfully" do
+      @gitto.should_receive(:log).with(30, 0).and_return(mock("logentries"))
+      do_get
+    end
+    
+    it "GETs page 3 successfully" do
+      @gitto.should_receive(:log).with(30, 60).and_return(mock("logentries"))
+      do_get(:page => 3)
+    end
+    
+    it "GETs the commits successfully" do
+      commits = mock("logentries")
+      @gitto.should_receive(:log).with(30, 0).and_return(commits)
+      do_get
+      response.should be_success
+      assigns[:git].should == @gitto
+      assigns[:commits].should == commits
+    end
+    
+    it "assigns the tags for easy lookup" do
+      @gitto.should_receive(:log).with(30, 0).and_return(mock("logentries"))
+      @gitto.should_receive(:tags_by_sha).and_return({"foo" => ["bar"]})
       do_get
-      assigns[:tags_per_sha].should == {:write => "me"}
+      assigns[:tags_per_sha].should == {"foo" => ["bar"]}
     end
   end
 

--- a/spec/lib/gitorious/gitto_spec.rb
+++ b/spec/lib/gitorious/gitto_spec.rb
@@ -1,4 +1,5 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
+require "ostruct"
 
 describe Gitorious::Gitto do
   
@@ -69,6 +70,16 @@ describe Gitorious::Gitto do
     @gitto.remotes
   end
   
+  it "returns a list of tags grouped by sha" do
+    tag1 = OpenStruct.new(:name => "tag1", :sha => some_sha("a"))
+    tag2 = OpenStruct.new(:name => "tag2", :sha => some_sha("b"))
+    @git_mock.should_receive(:tags).exactly(3).times.and_return([tag1, tag2])
+    
+    @gitto.tags_by_sha.keys.sort.should == [tag1.sha, tag2.sha]
+    @gitto.tags_by_sha[tag1.sha].should == [tag1.name]
+    @gitto.tags_by_sha[tag2.sha].should == [tag2.name]
+  end
+  
   describe "objectish validation" do
     it "accepts good objectish" do
       proc{