From e25ddca0c462522703af93822863023f4a754390 Mon Sep 17 00:00:00 2001 From: Valeriy Sizov Date: Thu, 4 Oct 2012 19:31:31 +0300 Subject: Fix bug with branches whose name contains slash --- lib/extracts_path.rb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'lib/extracts_path.rb') diff --git a/lib/extracts_path.rb b/lib/extracts_path.rb index f36dae5289b..020ff5cdf14 100644 --- a/lib/extracts_path.rb +++ b/lib/extracts_path.rb @@ -56,22 +56,22 @@ module ExtractsPath # Append a trailing slash if we only get a ref and no file path id = input - id += '/' unless id.include?('/') - + id += '/' unless id.ends_with?('/') + valid_refs = @project.branches + @project.tags - valid_refs.select! { |v| id.start_with?("#{v}/") } - + valid_refs.select! { |v| id.start_with?("#{v.name}/") } + if valid_refs.length != 1 # No exact ref match, so just try our best pair = id.match(/([^\/]+)(.*)/).captures else # Partition the string into the ref and the path, ignoring the empty first value - pair = id.partition(valid_refs.first)[1..-1] + pair = id.partition(valid_refs.first.name)[1..-1] end end - # Remove leading slash from path - pair[1].gsub!(/^\//, '') + # Remove ending slashes from path + pair[1].gsub!(/^\/|\/$/, '') pair end -- cgit v1.2.1