mirrors/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2026-05-05 12:26:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

community/git: disable flaky permissions-related test

Browse Source
This commit is contained in:
Ariadne Conill 2020-12-30 11:08:39 -07:00
parent 28a93f7a94
commit d9f105e613
2 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
main/git/APKBUILD
View File

@ -58,6 +58,7 @@ subpackages="$pkgname-doc
source="https://www.kernel.org/pub/software/scm/git/git-$pkgver.tar.xz
git-daemon.initd
git-daemon.confd
remove-flaky-permissions-test.patch
"
_gitcoredir=/usr/libexec/git-core
@ -284,4 +285,5 @@ _perl_config() {
sha512sums="2ce154d6e224e78d7da2ea9b954d8cf56bdfe43636b93dd5045a950a7362d3943866b4949eb5ed03528d6e5f0466c33c233b502d84430ed9d90326bcc696101d git-2.30.0.tar.xz
89528cdd14c51fd568aa61cf6c5eae08ea0844e59f9af9292da5fc6c268261f4166017d002d494400945e248df6b844e2f9f9cd2d9345d516983f5a110e4c42a git-daemon.initd
fbf1f425206a76e2a8f82342537ed939ff7e623d644c086ca2ced5f69b36734695f9f80ebda1728f75a94d6cd2fcb71bf845b64239368caab418e4d368c141ec git-daemon.confd"
fbf1f425206a76e2a8f82342537ed939ff7e623d644c086ca2ced5f69b36734695f9f80ebda1728f75a94d6cd2fcb71bf845b64239368caab418e4d368c141ec git-daemon.confd
cc58e1774d8734ca9f31a33f8f40ba71f90fb882da8244e0aa01a481bcf3341086b9b73498532fce7863fde506dad548d274c708f70771b5c4e9a4ddbe0c9c52 remove-flaky-permissions-test.patch"

34
main/git/remove-flaky-permissions-test.patch Normal file
View File

@ -0,0 +1,34 @@
diff -urN git-2.30.0.orig/t/t4129-apply-samemode.sh git-2.30.0/t/t4129-apply-samemode.sh
--- git-2.30.0.orig/t/t4129-apply-samemode.sh 2020-12-30 11:07:20.975280000 -0700
+++ git-2.30.0/t/t4129-apply-samemode.sh 2020-12-30 11:07:44.208724465 -0700
@@ -73,30 +73,4 @@
test_i18ngrep "invalid mode" err
'
-test_expect_success POSIXPERM 'do not use core.sharedRepository for working tree files' '
- git reset --hard &&
- test_config core.sharedRepository 0666 &&
- (
- # Remove a default ACL if possible.
- (setfacl -k newdir 2>/dev/null || true) &&
- umask 0077 &&
-
- # Test both files (f1) and leading dirs (d)
- mkdir d &&
- touch f1 d/f2 &&
- git add f1 d/f2 &&
- git diff --staged >patch-f1-and-f2.txt &&
-
- rm -rf d f1 &&
- git apply patch-f1-and-f2.txt &&
-
- echo "-rw-------" >f1_mode.expected &&
- echo "drwx------" >d_mode.expected &&
- test_modebits f1 >f1_mode.actual &&
- test_modebits d >d_mode.actual &&
- test_cmp f1_mode.expected f1_mode.actual &&
- test_cmp d_mode.expected d_mode.actual
- )
-'
-
test_done