Skip to content

Commit e43ab53

Browse files
authored
unskip test_ignored_dir_unignored_subdirs test (#429)
1 parent 27a0f20 commit e43ab53

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ requires-python = ">=3.9"
2424
dynamic = ["version"]
2525
dependencies = [
2626
"gitpython>3",
27-
"dulwich>=0.23.1",
27+
"dulwich>=0.24.0",
2828
"pygit2>=1.14.0",
2929
"pygtrie>=2.3.2",
3030
"fsspec[tqdm]>=2024.2.0",

src/scmrepo/git/backend/dulwich/__init__.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ def commit(self, msg: str, no_verify: bool = False):
382382

383383
with reraise((Error, CommitError), SCMError("Git commit failed")):
384384
try:
385-
commit(self.root_dir, message=msg, no_verify=no_verify)
385+
commit(self.repo, message=msg, no_verify=no_verify)
386386
except InvalidUserIdentity as exc:
387387
raise SCMError("Git username and email must be configured") from exc
388388
except TimezoneFormatError as exc:
@@ -425,7 +425,7 @@ def branch(self, branch: str):
425425
from dulwich.porcelain import Error, branch_create
426426

427427
try:
428-
branch_create(self.root_dir, branch)
428+
branch_create(self.repo, branch)
429429
except Error as exc:
430430
raise SCMError(f"Failed to create branch '{branch}'") from exc
431431

@@ -909,7 +909,7 @@ def status(
909909

910910
with reraise(Error, SCMError("Git status failed")):
911911
staged, unstaged, untracked = git_status(
912-
self.root_dir, ignored=ignored, untracked_files=untracked_files
912+
self.repo, ignored=ignored, untracked_files=untracked_files
913913
)
914914

915915
return (

tests/test_git.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -921,7 +921,7 @@ def test_ignored(tmp_dir: TmpDir, scm: Git, git: Git, git_backend: str):
921921
assert not git.is_ignored(tmp_dir / "dir1" / "file2.txt")
922922

923923

924-
@pytest.mark.skip_git_backend("pygit2", "gitpython", "dulwich")
924+
@pytest.mark.skip_git_backend("pygit2", "gitpython")
925925
def test_ignored_dir_unignored_subdirs(tmp_dir: TmpDir, scm: Git, git: Git):
926926
tmp_dir.gen({".gitignore": "data/**\n!data/**/\n!data/**/*.csv"})
927927
scm.add([".gitignore"])

0 commit comments

Comments
 (0)