Skip to content

Commit

Permalink
fixing
Browse files Browse the repository at this point in the history
  • Loading branch information
Borda committed Jul 17, 2024
1 parent 2ce013c commit 93993b2
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 12 deletions.
3 changes: 2 additions & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ repos:
hooks:
- id: codespell
additional_dependencies: [tomli]
args: ["--write-changes"]
# args: ["--write-changes"] # consider enabling for auto-fif
exclude: "test/fixtures/"

- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.4.3
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ In the less common case that you do not want to install test dependencies, `pip

#### With editable *dependencies* (not preferred, and rarely needed)

In rare cases, you may want to work on GitPython and one or both of its [gitdb](https://github.com/gitpython-developers/gitdb) and [smmap](https://github.com/gitpython-developers/smmap) dependencies at the same time, with changes in your local working copy of gitdb or smmap immediatley reflected in the behavior of your local working copy of GitPython. This can be done by making editable installations of those dependencies in the same virtual environment where you install GitPython.
In rare cases, you may want to work on GitPython and one or both of its [gitdb](https://github.com/gitpython-developers/gitdb) and [smmap](https://github.com/gitpython-developers/smmap) dependencies at the same time, with changes in your local working copy of gitdb or smmap immediately reflected in the behavior of your local working copy of GitPython. This can be done by making editable installations of those dependencies in the same virtual environment where you install GitPython.

If you want to do that *and* you want the versions in GitPython's git submodules to be used, then pass `-e git/ext/gitdb` and/or `-e git/ext/gitdb/gitdb/ext/smmap` to `pip install`. This can be done in any order, and in separate `pip install` commands or the same one, so long as `-e` appears before *each* path. For example, you can install GitPython, gitdb, and smmap editably in the currently active virtual environment this way:

Expand Down
2 changes: 1 addition & 1 deletion doc/source/changes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ https://github.com/gitpython-developers/GitPython/releases/tag/3.1.42
3.1.41
======

This release is relevant for security as it fixes a possible arbitary
This release is relevant for security as it fixes a possible arbitrary
code execution on Windows.

See this PR for details: https://github.com/gitpython-developers/GitPython/pull/1792
Expand Down
6 changes: 3 additions & 3 deletions git/objects/util.py
Original file line number Diff line number Diff line change
Expand Up @@ -568,11 +568,11 @@ def addToStack(
yield rval

# Only continue to next level if this is appropriate!
nd = d + 1
if depth > -1 and nd > depth:
next_d = d + 1
if depth > -1 and next_d > depth:
continue

addToStack(stack, item, branch_first, nd)
addToStack(stack, item, branch_first, next_d)
# END for each item on work stack


Expand Down
3 changes: 1 addition & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ lint.unfixable = [
]

[tool.codespell]
skip = 'test/fixtures/reflog_*'
ignore-words-list="gud,doesnt"
#count = true
quiet-level = 3
quiet-level = 3
2 changes: 1 addition & 1 deletion test/test_exc.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@

_streams_n_substrings = (
None,
"steram",
"stream",
"ομορφο stream",
)

Expand Down
6 changes: 3 additions & 3 deletions test/test_index.py
Original file line number Diff line number Diff line change
Expand Up @@ -1018,7 +1018,7 @@ class Mocked:
@pytest.mark.xfail(
type(_win_bash_status) is WinBashStatus.Absent,
reason="Can't run a hook on Windows without bash.exe.",
rasies=HookExecutionError,
raises=HookExecutionError,
)
@pytest.mark.xfail(
type(_win_bash_status) is WinBashStatus.WslNoDistro,
Expand Down Expand Up @@ -1077,7 +1077,7 @@ def test_hook_uses_shell_not_from_cwd(self, rw_dir, case):
@pytest.mark.xfail(
type(_win_bash_status) is WinBashStatus.Absent,
reason="Can't run a hook on Windows without bash.exe.",
rasies=HookExecutionError,
raises=HookExecutionError,
)
@pytest.mark.xfail(
type(_win_bash_status) is WinBashStatus.WslNoDistro,
Expand Down Expand Up @@ -1120,7 +1120,7 @@ def test_pre_commit_hook_fail(self, rw_repo):
@pytest.mark.xfail(
type(_win_bash_status) is WinBashStatus.Absent,
reason="Can't run a hook on Windows without bash.exe.",
rasies=HookExecutionError,
raises=HookExecutionError,
)
@pytest.mark.xfail(
type(_win_bash_status) is WinBashStatus.Wsl,
Expand Down

0 comments on commit 93993b2

Please sign in to comment.