diff --git a/lib/git/lib.rb b/lib/git/lib.rb
index d892462a..2d6c129d 100644
--- a/lib/git/lib.rb
+++ b/lib/git/lib.rb
@@ -1191,8 +1191,9 @@ def escape_for_sh(s)
end
def escape_for_windows(s)
- # Windows does not need single quote escaping inside double quotes
- %Q{"#{s}"}
+ # Escape existing double quotes in s and then wrap the result with double quotes
+ escaped_string = s.to_s.gsub('"','\\"')
+ %Q{"#{escaped_string}"}
end
def windows_platform?
diff --git a/tests/units/test_windows_cmd_escaping.rb b/tests/units/test_windows_cmd_escaping.rb
new file mode 100644
index 00000000..a5d994d9
--- /dev/null
+++ b/tests/units/test_windows_cmd_escaping.rb
@@ -0,0 +1,22 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+require File.dirname(__FILE__) + '/../test_helper'
+
+# Test diff when the file path has to be quoted according to core.quotePath
+# See https://git-scm.com/docs/git-config#Documentation/git-config.txt-corequotePath
+#
+class TestWindowsCmdEscaping < Test::Unit::TestCase
+ def test_commit_with_double_quote_in_commit_message
+ expected_commit_message = 'Commit message with "double quotes"'
+ in_temp_dir do |path|
+ create_file('README.md', "# README\n")
+ git = Git.init('.')
+ git.add
+ git.commit(expected_commit_message)
+ commits = git.log(1)
+ actual_commit_message = commits.first.message
+ assert_equal(expected_commit_message, actual_commit_message)
+ end
+ end
+end
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy