Merge branch 'cygwin' of https://github.com/ankostis/GitPython into ankostis-cygwin

1 files changed, 26 insertions, 8 deletions

diff --git a/git/test/test_submodule.py b/git/test/test_submodule.py
index 9db4f9c9..fcaad04b 100644
--- a/git/test/test_submodule.py
+++ b/git/test/test_submodule.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # This module is part of GitPython and is released under
 # the BSD License: http://www.opensource.org/licenses/bsd-license.php
 import os
@@ -6,24 +7,34 @@ from unittest.case import skipIf
 
 import git
 from git.cmd import Git
-from git.compat import string_types, is_win
+from git.compat import (
+    string_types,
+    is_win,
+)
 from git.exc import (
     InvalidGitRepositoryError,
     RepositoryDirtyError
 )
 from git.objects.submodule.base import Submodule
-from git.objects.submodule.root import RootModule, RootUpdateProgress
+from git.objects.submodule.root import (
+    RootModule,
+    RootUpdateProgress,
+)
 from git.repo.fun import (
     find_git_dir,
-    touch
+    touch,
 )
 from git.test.lib import (
     TestBase,
-    with_rw_repo
+    with_rw_repo,
 )
 from git.test.lib import with_rw_directory
-from git.util import HIDE_WINDOWS_KNOWN_ERRORS
-from git.util import to_native_path_linux, join_path_native
+from git.util import (
+    to_native_path_linux,
+    join_path_native,
+    HIDE_WINDOWS_KNOWN_ERRORS,
+)
+
 import os.path as osp
 
 
@@ -673,6 +684,13 @@ class TestSubmodule(TestBase):
                                   url=empty_repo_dir, no_checkout=checkout_mode and True or False)
         # end for each checkout mode
 
+    @skipIf(HIDE_WINDOWS_KNOWN_ERRORS and Git.is_cygwin(),
+            """FIXME: ile "C:\projects\gitpython\git\cmd.py", line 671, in execute
+                raise GitCommandError(command, status, stderr_value, stdout_value)
+            GitCommandError: Cmd('git') failed due to: exit code(128)
+              cmdline: git add 1__Xava verbXXten 1_test _myfile 1_test_other_file 1_XXava-----verbXXten
+              stderr: 'fatal: pathspec '"1__çava verböten"' did not match any files'
+                """)
     @with_rw_directory
     def test_git_submodules_and_add_sm_with_new_commit(self, rwdir):
         parent = git.Repo.init(osp.join(rwdir, 'parent'))
@@ -705,7 +723,7 @@ class TestSubmodule(TestBase):
         fp = osp.join(smm.working_tree_dir, 'empty-file')
         with open(fp, 'w'):
             pass
-        smm.git.add(fp)
+        smm.git.add(Git.polish_url(fp))
         smm.git.commit(m="new file added")
 
         # submodules are retrieved from the current commit's tree, therefore we can't really get a new submodule
@@ -730,7 +748,7 @@ class TestSubmodule(TestBase):
         assert commit_sm.binsha == sm_too.binsha
         assert sm_too.binsha != sm.binsha
 
-    # @skipIf(HIDE_WINDOWS_KNOWN_ERRORS,
+    # @skipIf(HIDE_WINDOWS_KNOWN_ERRORS,  ## ACTUALLY skipped by `git.submodule.base#L869`.
     #         "FIXME: helper.wrapper fails with: PermissionError: [WinError 5] Access is denied: "
     #         "'C:\\Users\\appveyor\\AppData\\Local\\Temp\\1\\test_work_tree_unsupportedryfa60di\\master_repo\\.git\\objects\\pack\\pack-bc9e0787aef9f69e1591ef38ea0a6f566ec66fe3.idx")  # noqa E501
     @with_rw_directory