Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #10 from iteleport/to_contribute

Fixed bug that occurred when different branches had braids pointing to
  • Loading branch information...
commit d671e6b79bbcd520902be7ad9a8016dd5aea87e7 2 parents 2dfb78b + 346964b
Travis Tilley ttilley authored
Showing with 9 additions and 1 deletion.
  1. +9 −1 lib/braid/mirror.rb
10 lib/braid/mirror.rb
View
@@ -47,7 +47,7 @@ def self.new_from_options(url, options = {})
path = "vendor/plugins/#{path}"
end
- remote = "braid/#{path}".gsub("_", '-') # stupid git svn changes all _ to ., weird
+ remote = "#{branch}/braid/#{path}".gsub("_", '-') # stupid git svn changes all _ to ., weird
squashed = !options["full"]
branch = nil if type == "svn"
@@ -118,6 +118,14 @@ def cached_url
git_cache.path(url)
end
+ def remote
+ if (attributes["remote"] && attributes["remote"] =~ /^braid\//)
+ attributes["remote"] = "#{branch}/#{attributes["remote"]}"
+ else
+ attributes["remote"]
+ end
+ end
+
private
def method_missing(name, *args)
Please sign in to comment.
Something went wrong with that request. Please try again.