Commita2d248b

committed

cygwin,#533: polish abs-paths ingit add commands

+ 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

1 parent3b1cfcc commita2d248bCopy full SHA for a2d248b

File tree

3 files changed

-2

lines changed

git
- test
  - test_diff.py
  - test_submodule.py
- util.py

3 files changed

-2

lines changed

`‎git/test/test_diff.py`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@`
`25`	`25`	`NULL_TREE,`
`26`	`26`	`)`
`27`	`27`	`importddt`
	`28`	`+fromgit.cmdimportGit`
`28`	`29`
`29`	`30`
`30`	`31`	`@ddt.ddt`
`@@ -56,7 +57,7 @@ def test_diff_with_staged_file(self, rw_dir):`
`56`	`57`	`fp=os.path.join(rw_dir,'hello.txt')`
`57`	`58`	`withopen(fp,'w')asfs:`
`58`	`59`	`fs.write("hello world")`
`59`		`-r.git.add(fp)`
	`60`	`+r.git.add(Git.polish_url(fp))`
`60`	`61`	`r.git.commit(message="init")`
`61`	`62`
`62`	`63`	`withopen(fp,'w')asfs:`

`‎git/test/test_submodule.py`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -705,7 +705,7 @@ def test_git_submodules_and_add_sm_with_new_commit(self, rwdir):`
`705`	`705`	`fp=osp.join(smm.working_tree_dir,'empty-file')`
`706`	`706`	`withopen(fp,'w'):`
`707`	`707`	`pass`
`708`		`-smm.git.add(fp)`
	`708`	`+smm.git.add(Git.polish_url(fp))`
`709`	`709`	`smm.git.commit(m="new file added")`
`710`	`710`
`711`	`711`	`# submodules are retrieved from the current commit's tree, therefore we can't really get a new submodule`

`‎git/util.py`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -264,6 +264,7 @@ def _cygexpath(drive, path):`
`264`	`264`
`265`	`265`
`266`	`266`	`defcygpath(path):`
	`267`	+"""Use :meth:`git.cmd.Git.polish_url()` instead, that works on any environment."""
`267`	`268`	`ifnotpath.startswith(('/cygdrive','//')):`
`268`	`269`	`forregex,parser,recursein_cygpath_parsers:`
`269`	`270`	`match=regex.match(path)`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commita2d248b

File tree

3 files changed

3 files changed

`‎git/test/test_diff.py`

`‎git/test/test_submodule.py`

`‎git/util.py`

0 commit comments