Fixing Git::Lib.escape

robertodecurnex · robertodecurnex · commit d9556b4ac3ad · 2014-01-13T14:57:39.000-03:00
closes ruby-git#5 closes ruby-git#39
diff --git a/lib/git/lib.rb b/lib/git/lib.rb
@@ -783,8 +783,7 @@ def run_command(git_cmd, &block)
     end
 
     def escape(s)
-      escaped = s.to_s.gsub('\'', '\'\\\'\'')
-      %Q{"#{escaped}"}
+      "'#{s && s.to_s.gsub("'","\\'")}'"
     end
 
   end
diff --git a/tests/units/test_branch.rb b/tests/units/test_branch.rb
@@ -61,7 +61,9 @@ def test_branch_create_and_switch
 
         new_file('test-file1', 'blahblahblah1')
         new_file('test-file2', 'blahblahblah2')
+        new_file('.test-dot-file1', 'blahblahblahdot1')
         assert(g.status.untracked.assoc('test-file1'))
+        assert(g.status.untracked.assoc('.test-dot-file1'))
         
         g.add(['test-file1', 'test-file2'])
         assert(!g.status.untracked.assoc('test-file1'))
diff --git a/tests/units/test_logger.rb b/tests/units/test_logger.rb
@@ -19,7 +19,7 @@ def test_logger
     @git.branches.size
     
     logc = File.read(log.path)
-    assert(/INFO -- : git branch "-a"/.match(logc))
+    assert(/INFO -- : git branch '-a'/.match(logc))
     assert(/DEBUG -- : \* git_grep/.match(logc))
 
     log = Tempfile.new('logfile')
@@ -31,7 +31,7 @@ def test_logger
     @git.branches.size
     
     logc = File.read(log.path)
-    assert(/INFO -- : git branch "-a"/.match(logc))
+    assert(/INFO -- : git branch '-a'/.match(logc))
     assert(!/DEBUG -- : \* git_grep/.match(logc))
   end
   
