Skip to content

Commit

Permalink
cygwin, #533: polish abs-paths in git add commands
Browse files Browse the repository at this point in the history
+ Modify TCs - no main-code changes.
+ FIXed:
  + `TestSubmodule.test_git_submodules_and_add_sm_with_new_commit()`
  + TestDiff.test_diff_with_staged_file()

- Cygwin TCs failing:
  - PY2: err: 12, fail: 2
  - PY3: err: 11, fail: 2
  • Loading branch information
ankostis committed Oct 16, 2016
1 parent 3b1cfcc commit a2d248b
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
3 changes: 2 additions & 1 deletion git/test/test_diff.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
NULL_TREE,
)
import ddt
from git.cmd import Git


@ddt.ddt
Expand Down Expand Up @@ -56,7 +57,7 @@ def test_diff_with_staged_file(self, rw_dir):
fp = os.path.join(rw_dir, 'hello.txt')
with open(fp, 'w') as fs:
fs.write("hello world")
r.git.add(fp)
r.git.add(Git.polish_url(fp))
r.git.commit(message="init")

with open(fp, 'w') as fs:
Expand Down
2 changes: 1 addition & 1 deletion git/test/test_submodule.py
Original file line number Diff line number Diff line change
Expand Up @@ -705,7 +705,7 @@ def test_git_submodules_and_add_sm_with_new_commit(self, rwdir):
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
Expand Down
1 change: 1 addition & 0 deletions git/util.py
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,7 @@ def _cygexpath(drive, path):


def cygpath(path):
"""Use :meth:`git.cmd.Git.polish_url()` instead, that works on any environment."""
if not path.startswith(('/cygdrive', '//')):
for regex, parser, recurse in _cygpath_parsers:
match = regex.match(path)
Expand Down

0 comments on commit a2d248b

Please sign in to comment.