Merge remote-tracking branch 'origin/release4.11'

Conflicts: Gemfile.lock
flexera-public · Dec 27, 2013 · 68fcf85 · 68fcf85 · flexera-ci · Dec 27, 2013
2 parents 0b1eaab + 113fe41
commit 68fcf85
Showing 1 changed file with 2 additions and 7 deletions.
diff --git a/lib/right_scraper/retrievers/git.rb b/lib/right_scraper/retrievers/git.rb
@@ -25,6 +25,7 @@
 require 'right_scraper/retrievers'
 
 require 'fileutils'
+require 'shellwords'
 require 'tmpdir'
 require 'right_git'
 require 'right_support'
@@ -157,8 +158,6 @@ def do_update_tag
 
     DEFAULT_BRANCH_NAME = 'master'
 
-    GIT_REVISION_REGEX = /^[A-Za-z0-9._-]+$/
-
     def git_repo_for(dir)
       ::RightGit::Git::Repository.new(
         dir,
@@ -250,11 +249,7 @@ def do_clean_all(git_repo)
 
     def resolve_revision
       revision = @repository.tag.to_s.strip
-      revision = DEFAULT_BRANCH_NAME if revision.empty?
-      unless revision =~ GIT_REVISION_REGEX
-        raise RetrieverError, "Revision reference contained illegal characters: #{revision.inspect}"
-      end
-      revision
+      revision.empty? ? DEFAULT_BRANCH_NAME : revision.shellescape
     end
 
     # Validates the given revision string to ensure it is safe and sane before