diff options
| -rw-r--r-- | lib/redmine/scm/adapters/bazaar_adapter.rb | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/lib/redmine/scm/adapters/bazaar_adapter.rb b/lib/redmine/scm/adapters/bazaar_adapter.rb index cce165321..09e840a37 100644 --- a/lib/redmine/scm/adapters/bazaar_adapter.rb +++ b/lib/redmine/scm/adapters/bazaar_adapter.rb @@ -248,18 +248,11 @@ module Redmine end def self.branch_conf_path(path) - bcp = nil + return unless path m = path.match(%r{^(.*[/\\])\.bzr.*$}) - if m - bcp = m[1] - else - bcp = path - end + bcp = m ? m[1] : path.dup bcp.gsub!(%r{[\/\\]$}, "") - if bcp - bcp = File.join(bcp, ".bzr", "branch", "branch.conf") - end - bcp + File.join(bcp, ".bzr", "branch", "branch.conf") end def append_revisions_only |