| 1 |
commit: dc0e0cc69eb0aac984574a9be3ecf19eaca09806 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Sep 1 23:42:41 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Sep 1 23:43:06 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc0e0cc6 |
| 7 |
|
| 8 |
dev-vcs/git: add missing patch |
| 9 |
|
| 10 |
Fixes: 8421a765ad29bcf111da8f05bb74ff3df64d25c5 |
| 11 |
Bug: https://bugs.gentoo.org/751907 |
| 12 |
Closes: https://bugs.gentoo.org/811369 |
| 13 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 14 |
|
| 15 |
dev-vcs/git/files/git-2.32.0-r1-test-t5582.patch | 22 ++++++++++++++++++++++ |
| 16 |
1 file changed, 22 insertions(+) |
| 17 |
|
| 18 |
diff --git a/dev-vcs/git/files/git-2.32.0-r1-test-t5582.patch b/dev-vcs/git/files/git-2.32.0-r1-test-t5582.patch |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..fc6072bf733 |
| 21 |
--- /dev/null |
| 22 |
+++ b/dev-vcs/git/files/git-2.32.0-r1-test-t5582.patch |
| 23 |
@@ -0,0 +1,22 @@ |
| 24 |
+https://www.spinics.net/lists/git/msg417169.html |
| 25 |
+https://bugs.gentoo.org/751907 |
| 26 |
+ |
| 27 |
+The test fails when ${D} is exported in the environment. It actually _shouldn't_ |
| 28 |
+be exported in src_test anyway, but Portage isn't yet fixed for this because |
| 29 |
+it'll break misbehaving ebuilds (see e.g. pkgcheck's VariableScope warnings). |
| 30 |
+ |
| 31 |
+Upstream are currently discussing other patches and work to find other cases |
| 32 |
+of environment contamination. |
| 33 |
+--- a/t/t5582-fetch-negative-refspec.sh |
| 34 |
++++ b/t/t5582-fetch-negative-refspec.sh |
| 35 |
+@@ -105,7 +105,6 @@ test_expect_success "fetch with negative pattern refspec does not expand prefix" |
| 36 |
+ ' |
| 37 |
+ |
| 38 |
+ test_expect_success "fetch with negative refspec avoids duplicate conflict" ' |
| 39 |
+- cd "$D" && |
| 40 |
+ ( |
| 41 |
+ cd one && |
| 42 |
+ git branch dups/a && |
| 43 |
+-- |
| 44 |
+2.30.2 |
| 45 |
+ |
Archives