1.7.1dev: merge [17894] from 1.6-stable (fix for #13879)

git-svn-id: http://trac.edgewall.org/intertrac/log:/trunk@17895 af82e41b-90c4-0310-8c96-b1721e28e2e2

Author: jomae

tracopt/versioncontrol/git/tests/git_fs.py

@@ -41,6 +41,12 @@ class GitCommandMixin(object):
 
     git_bin = locate('git')
 
+    _git_opts = (
+        '-c', 'init.defaultBranch=master',
+        '-c', 'protocol.file.allow=always',
+        '-c', 'core.protectNTFS=false',
+    )
+
     def _git_commit(self, *args, **kwargs):
         env = kwargs.get('env') or os.environ.copy()
         if 'date' in kwargs:
@@ -50,16 +56,14 @@ def _git_commit(self, *args, **kwargs):
         return self._git(*args, **kwargs)
 
     def _spawn_git(self, *args, **kwargs):
-        args = (self.git_bin,) + args
+        args = (self.git_bin,) + self._git_opts + args
         kwargs.setdefault('stdin', DEVNULL)
         kwargs.setdefault('stdout', PIPE)
         kwargs.setdefault('stderr', PIPE)
         kwargs.setdefault('cwd', self.repos_path)
         return Popen(args, close_fds=close_fds, **kwargs)
 
     def _git(self, *args, **kwargs):
-        args = ('-c', 'init.defaultBranch=master',
-                '-c', 'protocol.file.allow=always') + args
         with self._spawn_git(*args, **kwargs) as proc:
             stdout, stderr = proc.communicate()
         self.assertEqual(0, proc.returncode,