gentoo auto-resync : 14:11:2022 - 00:49:44

4 files changed, 47 insertions, 1 deletions

diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 388a87b9d9e1..0d0b94393769 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/pre-commit/Manifest b/dev-vcs/pre-commit/Manifest
index 40840a5bd592..0528cb52d2c2 100644
--- a/dev-vcs/pre-commit/Manifest
+++ b/dev-vcs/pre-commit/Manifest
@@ -1,6 +1,7 @@
 AUX pre-commit-2.20.0-no_toml.patch 2448 BLAKE2B 1f067b87826fe582b4b9afaf235ec25ff53eefb5b05b28edcc477c9a697e223df0bcda3330afc6ed868c5cdf0ca836da53c884901039c05a7cbd06cbd9e8e2a7 SHA512 7fbd1dcc0fae28d8265827def2ed73eccc65791912e6bd410c457d4c437a385991af9675107634be319ba5fe1521af3309d29f49e2bcc6dcdc091a2a28925beb
+AUX pre-commit-2.20.0-tests_git_file_transport.patch 2021 BLAKE2B 764b353d3268176162ae2a5d6fc97c0cb9ad7d2cd5de69f19f8fcd78c8bba507f25f53cd3d6c767fbcb9b9f885f8eceda2fc82d1b6ed54f34c1d4907d0fddd72 SHA512 6d8a3b5c9026f5c20a84d581ca92d74743643de010af468217b2f44324560d56b504e033ccebe102194492b25a01a4ed503995c222561ce406577fce211c2eab
 DIST pre-commit-2.20.0.gh.tar.gz 266604 BLAKE2B 470f032e6d5bfcdd9ac8ba8f37d4323b601da0c82bcd524ffc575dc688fe81ad326a1f6a8ddd03da6e37130319ee40070c03d9789cd6e0e4b427a1d6e646416e SHA512 b1da558a0e5d8f2f655427089f1d0b11b01ad7513ece7a0b3b67c33529cf3584edba558c78704e6da6ca18876b1d6c0fa8698e01fd7c2439b8d4dc0a93961e52
 DIST pre-commit-2.20.0.tar.gz 266604 BLAKE2B 470f032e6d5bfcdd9ac8ba8f37d4323b601da0c82bcd524ffc575dc688fe81ad326a1f6a8ddd03da6e37130319ee40070c03d9789cd6e0e4b427a1d6e646416e SHA512 b1da558a0e5d8f2f655427089f1d0b11b01ad7513ece7a0b3b67c33529cf3584edba558c78704e6da6ca18876b1d6c0fa8698e01fd7c2439b8d4dc0a93961e52
-EBUILD pre-commit-2.20.0-r1.ebuild 1622 BLAKE2B 81436933bc5a602e8c802652229112c78618d1ac67ecb8265d8f8986d6d338e11d7ab29726e6de0ac1458d640977caa865055009396961dd50ffd70f1c2dc602 SHA512 f63b39f52bd66dca9a54052a3db18585f26a9ab187a16ef6bb251ff88135de901f2d581dd5f0875f95ecf5be9b9f6d32ec8aa3dca7fe3ab31ea3e15d83def129
+EBUILD pre-commit-2.20.0-r1.ebuild 1681 BLAKE2B ac198af537379863f3294f8cfeb8c50fea21b26e92680f4bbfabb606d83586d912a8c3da03743b103260d1652661bb37a3495f8252598a5192a3eae0aac3cc55 SHA512 1f8fe7414b8f4d668e0e494863a81ce0ce0b6a3d23f24845b44a7f2c08d9859ed8847cf69484282f38902959443aa92a796a8b18d8869b4b5b190b94bf58986d
 EBUILD pre-commit-2.20.0.ebuild 1598 BLAKE2B 3b12bd2c4b0813038c689ea053600bdca89409f34e86cad85dd6646dc8c0ed71689a4c1fbb7928a810b7f3543768d472e43173bca9311d05089b8b765de23335 SHA512 595a35b0592aa24a59568b2c146e6bd7fc96f42ab86a4f27f92cc8c069154387efe9469f89407c85dec340952fe6e6713f84f9e7636be25a445da90b0822986f
 MISC metadata.xml 380 BLAKE2B 99842a97367e91700c6f714f427b7b3d4b7212c401abae5ab715dfaa724776f02fe250184a33504d3433bb58cd5679af59a32ec21a7e7432481160dab36a4d95 SHA512 45330930d1e58fc1de0fd0ba55cd488dee96579ceab3be5073b91ff8f4f2b9adefff533dbfa5b0e8b23fbb648d45c0b7b4073a1ec57b586600cc2bf6347e0bbb
diff --git a/dev-vcs/pre-commit/files/pre-commit-2.20.0-tests_git_file_transport.patch b/dev-vcs/pre-commit/files/pre-commit-2.20.0-tests_git_file_transport.patch
new file mode 100644
index 000000000000..9845e1311da5
--- /dev/null
+++ b/dev-vcs/pre-commit/files/pre-commit-2.20.0-tests_git_file_transport.patch
@@ -0,0 +1,44 @@
+--- a/tests/commands/install_uninstall_test.py
++++ b/tests/commands/install_uninstall_test.py
+@@ -176,7 +176,7 @@
+ def test_install_in_submodule_and_run(tempdir_factory, store):
+     src_path = make_consuming_repo(tempdir_factory, 'script_hooks_repo')
+     parent_path = git_dir(tempdir_factory)
+-    cmd_output('git', 'submodule', 'add', src_path, 'sub', cwd=parent_path)
++    cmd_output('git', '-c', 'protocol.file.allow=always', 'submodule', 'add', src_path, 'sub', cwd=parent_path)
+     git_commit(cwd=parent_path)
+ 
+     sub_pth = os.path.join(parent_path, 'sub')
+--- a/tests/conftest.py
++++ b/tests/conftest.py
+@@ -90,7 +90,7 @@
+     git_dir_1 = git_dir(tempdir_factory)
+     git_dir_2 = git_dir(tempdir_factory)
+     git_commit(msg=in_conflicting_submodule.__name__, cwd=git_dir_2)
+-    cmd_output('git', 'submodule', 'add', git_dir_2, 'sub', cwd=git_dir_1)
++    cmd_output('git', '-c', 'protocol.file.allow=always', 'submodule', 'add', git_dir_2, 'sub', cwd=git_dir_1)
+     with cwd(os.path.join(git_dir_1, 'sub')):
+         _make_conflict()
+         yield
+--- a/tests/repository_test.py
++++ b/tests/repository_test.py
+@@ -443,7 +443,7 @@
+     repo.join('main.go').write(main_go)
+     cmd_output('git', '-C', str(repo), 'init', '.')
+     cmd_output('git', '-C', str(repo), 'add', '.')
+-    cmd_output('git', '-C', str(repo), 'submodule', 'add', str(sub), 'sub')
++    cmd_output('git', '-C', str(repo), '-c', 'protocol.file.allow=always', 'submodule', 'add', str(sub), 'sub')
+     git.commit(str(repo))
+ 
+     config = make_config_from_repo(str(repo))
+--- a/tests/staged_files_only_test.py
++++ b/tests/staged_files_only_test.py
+@@ -207,7 +207,7 @@
+         cmd_output('git', 'add', 'bar')
+         git_commit()
+         cmd_output(
+-            'git', 'submodule', 'add', repo_with_commits.path, 'sub',
++            'git', '-c', 'protocol.file.allow=always', 'submodule', 'add', repo_with_commits.path, 'sub',
+         )
+         checkout_submodule(repo_with_commits.rev1)
+         cmd_output('git', 'add', 'sub')
diff --git a/dev-vcs/pre-commit/pre-commit-2.20.0-r1.ebuild b/dev-vcs/pre-commit/pre-commit-2.20.0-r1.ebuild
index 5c803594ede5..0661c9a15854 100644
--- a/dev-vcs/pre-commit/pre-commit-2.20.0-r1.ebuild
+++ b/dev-vcs/pre-commit/pre-commit-2.20.0-r1.ebuild
@@ -35,6 +35,7 @@ BDEPEND="test? (
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.20.0-no_toml.patch
+	"${FILESDIR}"/${PN}-2.20.0-tests_git_file_transport.patch
 )
 
 DOCS=( CHANGELOG.md CONTRIBUTING.md README.md )