* [PR PATCH] Git 2.43.1
@ 2024-02-13 11:44 sgn
2024-02-13 12:59 ` [PR PATCH] [Merged]: " sgn
0 siblings, 1 reply; 2+ messages in thread
From: sgn @ 2024-02-13 11:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1215 bytes --]
There is a new pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages git-2.43.1
https://github.com/void-linux/void-packages/pull/48694
Git 2.43.1
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/48694.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-git-2.43.1-48694.patch --]
[-- Type: text/x-diff, Size: 3226 bytes --]
From 858cccbc82e381b90724a1fc26f70932a6dad901 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 13 Feb 2024 18:38:45 +0700
Subject: [PATCH 1/2] chroot-git: update to 2.43.1.
---
srcpkgs/chroot-git/template | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template
index 3e2d1847cde84..988583000aaef 100644
--- a/srcpkgs/chroot-git/template
+++ b/srcpkgs/chroot-git/template
@@ -1,6 +1,6 @@
# Template file for 'chroot-git'
pkgname=chroot-git
-version=2.40.1
+version=2.43.1
revision=1
bootstrap=yes
makedepends="zlib-devel"
@@ -9,7 +9,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="GPL-2.0-only"
homepage="https://git-scm.com/"
distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
-checksum=4893b8b98eefc9fdc4b0e7ca249e340004faa7804a433d17429e311e1fef21d2
+checksum=2234f37b453ff8e4672c21ad40d41cc7393c9a8dcdfe640bec7ac5b5358f30d2
repository=bootstrap
if [ "$CHROOT_READY" ]; then
@@ -62,9 +62,6 @@ do_build() {
}
do_check() {
- if [ "$CHROOT_READY" ] && [ "$XBPS_ALLOW_CHROOT_BREAKOUT" ]; then
- export IKNOWWHATIAMDOING=YES
- fi
make test ${makejobs}
}
From 7425ffc11c63334da3e62dcc7da03bec442015e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 13 Feb 2024 18:39:21 +0700
Subject: [PATCH 2/2] git: update to 2.43.1.
---
srcpkgs/git/template | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 085d73430034a..025cc7ab0868b 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,6 +1,6 @@
# Template file for 'git'
pkgname=git
-version=2.43.0
+version=2.43.1
revision=1
hostmakedepends="asciidoc gettext perl pkg-config tk xmlto"
makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel"
@@ -14,7 +14,7 @@ license="GPL-2.0-only"
homepage="https://git-scm.com/"
changelog="https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/${version}.txt"
distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
-checksum=5446603e73d911781d259e565750dcd277a42836c8e392cac91cf137aa9b76ec
+checksum=2234f37b453ff8e4672c21ad40d41cc7393c9a8dcdfe640bec7ac5b5358f30d2
replaces="git-perl>=0"
python_version=3
@@ -35,7 +35,7 @@ do_configure() {
perllibdir=/usr/share/perl5/vendor_perl
PYTHON_PATH=/usr/bin/python3
DEFAULT_TEST_TARGET = prove
- GIT_PROVE_OPTS = $makejobs
+ GIT_PROVE_OPTS = $makejobs --nocolor --nocount -s
# firstword (uname -m)
HOST_CPU = ${XBPS_TARGET_MACHINE%-musl}
# this flag will skip shipping unneeded symlinks
@@ -63,14 +63,13 @@ do_build() {
}
do_check() {
- if [ "$XBPS_ALLOW_CHROOT_BREAKOUT" ]; then
- IKNOWWHATIAMDOING=YES make test ${makejobs}
- else
- make test ${makejobs}
- fi
+ make test ${makejobs}
make -C contrib/diff-highlight test
make -C contrib/subtree test
make -C contrib/credential/netrc test
+ cd t
+ # 2.44.0
+ # GIT_TEST_DEFAULT_REF_FORMAT=reftable ./t0610-reftable-basics.sh
}
do_install() {
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PR PATCH] [Merged]: Git 2.43.1
2024-02-13 11:44 [PR PATCH] Git 2.43.1 sgn
@ 2024-02-13 12:59 ` sgn
0 siblings, 0 replies; 2+ messages in thread
From: sgn @ 2024-02-13 12:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1069 bytes --]
There's a merged pull request on the void-packages repository
Git 2.43.1
https://github.com/void-linux/void-packages/pull/48694
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-02-13 12:59 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-02-13 11:44 [PR PATCH] Git 2.43.1 sgn
2024-02-13 12:59 ` [PR PATCH] [Merged]: " sgn
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).