Merge remote branch 'origin/sapphire_13_20_acu145670_escape_git_branc…

…h_names' into release4.11
flexera-public · Dec 27, 2013 · 113fe41 · 113fe41 · flexera-ci · Dec 27, 2013
2 parents 92cc05e + 0a7b1dc
commit 113fe41
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: git@github.com:rightscale/right_git.git
-  revision: 69814a78d191755991cc8983283b86be723cfa6f
+  revision: d50fb377f042d6942b4b043d095f2576c59f002b
   branch: release4.11
   specs:
     right_git (0.0.1)

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