Skip to content

Commit eef3f68

Browse files
committed
test: expect update test failure with Git v2.55.0+
Git v2.55.0+ no longer supports `git diff-tree --inter-hunk-context=-1 ...` which may lead to lower-quality or incorrect updates in some cases. Expecting test failure temporarily restores the test suite to pass until a proper fix becomes available.
1 parent 946a805 commit eef3f68

1 file changed

Lines changed: 9 additions & 0 deletions

File tree

tests/test_updatediff.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,15 @@
1010
import pexpect
1111
import pytest
1212
from inline_snapshot import snapshot
13+
from packaging.version import Version
1314
from plumbum import local
1415

1516
from copier._cli import CopierApp
1617
from copier._main import Worker, run_copy, run_update
1718
from copier._tools import normalize_git_path
1819
from copier._types import VcsRef
1920
from copier._user_data import load_answersfile_data
21+
from copier._vcs import get_git_version
2022
from copier.errors import UserMessageError
2123

2224
from .helpers import (
@@ -302,6 +304,13 @@ def test_updatediff(tmp_path_factory: pytest.TempPathFactory) -> None:
302304
)
303305

304306

307+
@pytest.mark.xfail(
308+
get_git_version() >= Version("2.55.0"),
309+
reason=(
310+
"Git v2.55.0+ no longer supports `--inter-hunk-context=-1` "
311+
"(https://github.com/copier-org/copier/issues/2759)"
312+
),
313+
)
305314
# This fails on Windows because there's some problem while detecting
306315
# the diff. It seems like an older Git version were being used, while
307316
# that's not the case...

0 commit comments

Comments
 (0)