diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2021-09-06 04:23:53 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2021-09-06 04:24:09 +0000 |
| commit | 1968ada2d36e4508ef787e57f0e5f63214bcbad7 (patch) | |
| tree | 69c01b5108b09faafa39e56ae48add8a2439f9db /tests/git_test.py | |
| parent | Releasing debian version 2.14.0-2. (diff) | |
| download | pre-commit-1968ada2d36e4508ef787e57f0e5f63214bcbad7.tar.xz pre-commit-1968ada2d36e4508ef787e57f0e5f63214bcbad7.zip | |
Merging upstream version 2.15.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'tests/git_test.py')
| -rw-r--r-- | tests/git_test.py | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/tests/git_test.py b/tests/git_test.py index 51d5f8c..aa21880 100644 --- a/tests/git_test.py +++ b/tests/git_test.py @@ -139,6 +139,24 @@ def test_get_changed_files(in_git_dir): assert files == [] +def test_get_changed_files_disparate_histories(in_git_dir): + """in modern versions of git, `...` does not fall back to full diff""" + git_commit() + in_git_dir.join('a.txt').ensure() + cmd_output('git', 'add', '.') + git_commit() + cmd_output('git', 'branch', '-m', 'branch1') + + cmd_output('git', 'checkout', '--orphan', 'branch2') + cmd_output('git', 'rm', '-rf', '.') + in_git_dir.join('a.txt').ensure() + in_git_dir.join('b.txt').ensure() + cmd_output('git', 'add', '.') + git_commit() + + assert git.get_changed_files('branch1', 'branch2') == ['b.txt'] + + @pytest.mark.parametrize( ('s', 'expected'), ( |