|
2 | 2 | # the BSD License: http://www.opensource.org/licenses/bsd-license.php
|
3 | 3 | import os
|
4 | 4 | import sys
|
| 5 | +from unittest.case import skipIf |
5 | 6 |
|
6 | 7 | import git
|
7 | 8 | from git.cmd import Git
|
8 | 9 | from git.compat import string_types, is_win
|
9 |
| -from git.exc import ( |
10 |
| - InvalidGitRepositoryError, |
11 |
| - RepositoryDirtyError |
12 |
| -) |
| 10 | +from git.exc import InvalidGitRepositoryError, RepositoryDirtyError |
13 | 11 | from git.objects.submodule.base import Submodule
|
14 | 12 | from git.objects.submodule.root import RootModule, RootUpdateProgress
|
15 |
| -from git.repo.fun import ( |
16 |
| - find_git_dir, |
17 |
| - touch |
18 |
| -) |
19 |
| -from git.test.lib import ( |
20 |
| - TestBase, |
21 |
| - with_rw_repo |
22 |
| -) |
| 13 | +from git.repo.fun import find_git_dir, touch |
| 14 | +from git.test.lib import TestBase, with_rw_repo |
23 | 15 | from git.test.lib import with_rw_directory
|
24 |
| -from git.util import to_native_path_linux, join_path_native |
| 16 | +from git.util import to_native_path_linux, join_path_native, HIDE_WINDOWS_KNOWN_ERRORS |
25 | 17 |
|
26 | 18 | import os.path as osp
|
27 | 19 |
|
@@ -667,6 +659,13 @@ def test_add_empty_repo(self, rwdir):
|
667 | 659 | url=empty_repo_dir, no_checkout=checkout_mode and True or False)
|
668 | 660 | # end for each checkout mode
|
669 | 661 |
|
| 662 | + @skipIf(HIDE_WINDOWS_KNOWN_ERRORS and Git.isCygwin(), |
| 663 | + """FIXME: ile "C:\projects\gitpython\git\cmd.py", line 671, in execute |
| 664 | + raise GitCommandError(command, status, stderr_value, stdout_value) |
| 665 | + GitCommandError: Cmd('git') failed due to: exit code(128) |
| 666 | + cmdline: git add 1__��ava verb��ten 1_test _myfile 1_test_other_file 1_��ava-----verb��ten |
| 667 | + stderr: 'fatal: pathspec '"1__çava verböten"' did not match any files' |
| 668 | + """) |
670 | 669 | @with_rw_directory
|
671 | 670 | def test_git_submodules_and_add_sm_with_new_commit(self, rwdir):
|
672 | 671 | parent = git.Repo.init(osp.join(rwdir, 'parent'))
|
|
0 commit comments