Fix Gitlab::Git::Repository#commit returns wrong commit, if commit_id is "tag name".

Sato Hiroyuki
1 parent 963ec234
Showing 2 changed files with 11 additions and 4 deletions Show diff stats
lib/extracts_path.rb
lib/gitlab/git/repository.rb
@@ -98,9 +98,7 @@ module ExtractsPath
  
     @ref, @path = extract_ref(@id)
  
-    # It is used "@project.repository.commits(@ref, @path, 1, 0)",
-    # because "@project.repository.commit(@ref)" returns wrong commit when @ref is tag name.
-    @commit = @project.repository.commits(@ref, @path, 1, 0).first
+    @commit = @project.repository.commit(@ref)
  
     @tree = Tree.new(@project.repository, @commit.id, @ref, @path)
  
@@ -49,7 +49,16 @@ module Gitlab
  
       def commit(commit_id = nil)
         commit = if commit_id
-                   repo.commit(commit_id)
+                   # Find repo.refs first,
+                   # because if commit_id is "tag name",
+                   # repo.commit(commit_id) returns wrong commit sha
+                   # that is git tag object sha.
+                   ref = repo.refs.find {|r| r.name == commit_id}
+                   if ref
+                     ref.commit
+                   else
+                     repo.commit(commit_id)
+                   end
                  else
                    repo.commits(root_ref).first
                  end
...	...	@@ -98,9 +98,7 @@ module ExtractsPath
98	98
99	99	@ref, @path = extract_ref(@id)
100	100
101		- # It is used "@project.repository.commits(@ref, @path, 1, 0)",
102		- # because "@project.repository.commit(@ref)" returns wrong commit when @ref is tag name.
103		- @commit = @project.repository.commits(@ref, @path, 1, 0).first
	101	+ @commit = @project.repository.commit(@ref)
104	102
105	103	@tree = Tree.new(@project.repository, @commit.id, @ref, @path)
106	104
...	...
...	...	@@ -49,7 +49,16 @@ module Gitlab
49	49
50	50	def commit(commit_id = nil)
51	51	commit = if commit_id
52		- repo.commit(commit_id)
	52	+ # Find repo.refs first,
	53	+ # because if commit_id is "tag name",
	54	+ # repo.commit(commit_id) returns wrong commit sha
	55	+ # that is git tag object sha.
	56	+ ref = repo.refs.find {\|r\| r.name == commit_id}
	57	+ if ref
	58	+ ref.commit
	59	+ else
	60	+ repo.commit(commit_id)
	61	+ end
53	62	else
54	63	repo.commits(root_ref).first
55	64	end
...	...