mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-07-24 19:55:26 +03:00
parent
b7ffe153e1
commit
eec7f014bb
2 changed files with 49 additions and 2 deletions
|
@ -2,7 +2,7 @@
|
|||
# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
|
||||
pkgname=git-lfs
|
||||
pkgver=3.2.0
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
pkgdesc="Git extension for versioning large files"
|
||||
url="https://git-lfs.github.io/"
|
||||
arch="all"
|
||||
|
@ -14,8 +14,8 @@ install="$pkgname.post-install $pkgname.pre-deinstall"
|
|||
subpackages="$pkgname-doc"
|
||||
source="git-lfs-$pkgver.tar.gz::https://github.com/git-lfs/git-lfs/archive/v$pkgver.tar.gz
|
||||
makefile-extra_go_flags.patch
|
||||
fix-test-branch-name.patch
|
||||
"
|
||||
options="!check" # see #14242
|
||||
[ "$CARCH" = "x86" ] && options="!check" # tests broken on x86
|
||||
|
||||
# secfixes:
|
||||
|
@ -79,4 +79,5 @@ cleanup_srcdir() {
|
|||
sha512sums="
|
||||
c2ba8cecd5b3519a032f446b0c3043352f37f3c67ff3c2304a38beb176f0ae8efd1deaeb8bd54a35d7dd7dcd988da67249c896dffd83fc293b165a3e6bb02d66 git-lfs-3.2.0.tar.gz
|
||||
2d793da75b37324936407948fdb634ff4c510c4dd4d3575c2459b81a0a6eb8f2464f5066ae99e88d5bf69e357fd60354b9d9d53e062cb6ba709f5f3a39858466 makefile-extra_go_flags.patch
|
||||
7bf0db3be06ba75429a3bbe7d45c4738443912e8e0c80fa2cbdfe76a5ffca720c0f6f638178e0dcc3e2781613b4be575e6583ca3e55f430ab76420118d87cb45 fix-test-branch-name.patch
|
||||
"
|
||||
|
|
46
community/git-lfs/fix-test-branch-name.patch
Normal file
46
community/git-lfs/fix-test-branch-name.patch
Normal file
|
@ -0,0 +1,46 @@
|
|||
for some reasons, tests expect the default branch to be called 'main',
|
||||
while on alpine it's still 'master'.
|
||||
|
||||
to fix this, we can just rename the branch after cloning a test repo to 'main'.
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 0b73d9e..33503c0 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -565,6 +565,7 @@ test : fmt $(.DEFAULT_GOAL)
|
||||
tempdir="$$(mktemp -d)"; \
|
||||
export HOME="$$tempdir"; \
|
||||
export GIT_CONFIG_NOSYSTEM=1; \
|
||||
+ git config --global init.defaultBranch main; \
|
||||
$(GO) test -count=1 $(GO_TEST_EXTRA_ARGS) $(addprefix ./,$(PKGS)); \
|
||||
RET=$$?; \
|
||||
chmod -R u+w "$$tempdir"; \
|
||||
diff --git a/t/testhelpers.sh b/t/testhelpers.sh
|
||||
index 7c921f4..a1803d9 100644
|
||||
--- a/t/testhelpers.sh
|
||||
+++ b/t/testhelpers.sh
|
||||
@@ -419,6 +419,7 @@ clone_repo() {
|
||||
echo "clone local git repository $reponame to $dir"
|
||||
out=$(git clone "$GITSERVER/$reponame" "$dir" 2>&1)
|
||||
cd "$dir"
|
||||
+ git branch -m main
|
||||
|
||||
git config credential.helper lfstest
|
||||
echo "$out" > clone.log
|
||||
@@ -452,6 +453,7 @@ clone_repo_ssl() {
|
||||
echo "clone local git repository $reponame to $dir"
|
||||
out=$(git clone "$SSLGITSERVER/$reponame" "$dir" 2>&1)
|
||||
cd "$dir"
|
||||
+ git branch -m main
|
||||
|
||||
git config credential.helper lfstest
|
||||
|
||||
@@ -617,6 +619,8 @@ setup() {
|
||||
write_creds_file ":pass" "$CREDSDIR/--$certpath"
|
||||
write_creds_file ":pass" "$CREDSDIR/--$keypath"
|
||||
|
||||
+ git config --global init.defaultBranch main
|
||||
+
|
||||
echo "#"
|
||||
echo "# HOME: $HOME"
|
||||
echo "# TMP: $TMPDIR"
|
Loading…
Add table
Add a link
Reference in a new issue