Don't print git gem shas twice during bundle show

rubygems · Apr 3, 2010 · f69931f · f69931f
1 parent 6f45141
commit f69931f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/lib/bundler/rubygems_ext.rb b/lib/bundler/rubygems_ext.rb
@@ -19,9 +19,9 @@ def groups
 
     def git_version
       if @loaded_from && File.exist?(File.join(full_gem_path, ".git"))
-        rev = Dir.chdir(full_gem_path){ `git rev-parse HEAD`.strip }
+        sha = Dir.chdir(full_gem_path){ `git rev-parse HEAD`.strip }
         branch = full_gem_path.split("-")[3]
-        branch ? " #{branch}-#{rev[0...6]}" : " #{rev[0...6]}"
+        (branch && branch != sha) ? " #{branch}-#{sha[0...6]}" : " #{sha[0...6]}"
       end
     end
 

diff --git a/spec/other/show_spec.rb b/spec/other/show_spec.rb
@@ -65,4 +65,14 @@
     bundle :show
     out.should include("foo (1.0 omg-#{@revision}")
   end
+
+  it "doesn't print the branch when tied to a ref" do
+    sha = revision_for(lib_path("foo-1.0"))
+    install_gemfile <<-G
+      gem "foo", :git => "#{lib_path('foo-1.0')}", :ref => "#{sha}"
+    G
+
+    bundle :show
+    out.should include("foo (1.0 #{sha[0...6]})")
+  end
 end