kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed: GitAdapter#get_rev should use current branch instead of hardwiring @master@ (#1319). 

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1475 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2008-05-29 18:48:00 +00:00
parent 39216f327c
commit e1a86106d0
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/redmine/scm/adapters/git_adapter.rb
View File

@ -27,9 +27,13 @@ module Redmine
# Get the revision of a particuliar file # Get the revision of a particuliar file
def get_rev (rev,path) def get_rev (rev,path)
cmd="#{GIT_BIN} --git-dir #{target('')} show #{shell_quote rev} -- #{shell_quote path}" if rev!='latest' and (! rev.nil?)
cmd="#{GIT_BIN} --git-dir #{target('')} log -1 master -- #{shell_quote path}" if if rev != 'latest' && !rev.nil?
rev=='latest' or rev.nil? cmd="#{GIT_BIN} --git-dir #{target('')} show #{shell_quote rev} -- #{shell_quote path}"
else
branch = shellout("#{GIT_BIN} --git-dir #{target('')} branch") { |io| io.grep(/\*/)[0].strip.match(/\* (.*)/)[1] }
cmd="#{GIT_BIN} --git-dir #{target('')} log -1 #{branch} -- #{shell_quote path}"
end
rev=[] rev=[]
i=0 i=0
shellout(cmd) do |io| shellout(cmd) do |io|