From fd15e5fcaa2ef934921d4239a44f476044f62f70 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, 4 Oct 2022 07:43:18 +0700
Subject: [PATCH 1/2] chroot-git: update to 2.38.0.

---
 srcpkgs/chroot-git/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template
index 308bd62f8056..854ec7c2a168 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.37.3
+version=2.38.0
 revision=1
 bootstrap=yes
 wrksrc="git-${version}"
@@ -10,7 +10,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=814641d7f61659cfbc17825d0462499ca1403e39ff53d76a8512050e6483e87a
+checksum=923eade26b1814de78d06bda8e0a9f5da8b7c4b304b3f9050ffb464f0310320a
 
 if [ "$CHROOT_READY" ]; then
 	checkdepends="perl gnupg"
@@ -66,9 +66,10 @@ do_check() {
 }
 
 do_install() {
-	vbin git chroot-git
+	vmkdir usr/bin
 	vmkdir usr/libexec/chroot-git
-	ln -s ../../bin/chroot-git $DESTDIR/usr/libexec/chroot-git/git
+	vinstall git 755 usr/libexec/chroot-git
+	ln -s ../libexec/chroot-git/git $DESTDIR/usr/bin/chroot-git
 	ln -s git $DESTDIR/usr/libexec/chroot-git/git-upload-pack
 	ln -s git $DESTDIR/usr/libexec/chroot-git/git-receive-pack
 	if [ "$CHROOT_READY" ]; then

From b939621de7ce7850af9ab6bb51c6c442dbac8939 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, 4 Oct 2022 07:43:04 +0700
Subject: [PATCH 2/2] git: update to 2.38.0.

---
 srcpkgs/git-scalar   |  1 +
 srcpkgs/git/template | 25 +++++++++++++++++++------
 2 files changed, 20 insertions(+), 6 deletions(-)
 create mode 120000 srcpkgs/git-scalar

diff --git a/srcpkgs/git-scalar b/srcpkgs/git-scalar
new file mode 120000
index 000000000000..0899c2993dab
--- /dev/null
+++ b/srcpkgs/git-scalar
@@ -0,0 +1 @@
+git
\ No newline at end of file
diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 38259d411661..40e0c0bf10fd 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,6 +1,6 @@
 # Template file for 'git'
 pkgname=git
-version=2.37.3
+version=2.38.0
 revision=1
 hostmakedepends="asciidoc gettext perl pkg-config tk xmlto"
 makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel"
@@ -14,12 +14,13 @@ 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=814641d7f61659cfbc17825d0462499ca1403e39ff53d76a8512050e6483e87a
+checksum=923eade26b1814de78d06bda8e0a9f5da8b7c4b304b3f9050ffb464f0310320a
 replaces="git-perl>=0"
 register_shell=/usr/bin/git-shell
 python_version=3
 
-subpackages="git-cvs git-svn gitk git-gui git-all git-libsecret git-netrc"
+subpackages="git-cvs git-svn gitk git-gui git-all git-libsecret git-netrc
+ git-scalar"
 
 do_configure() {
 	cat <<-EOF >config.mak
@@ -38,6 +39,9 @@ do_configure() {
 	GIT_PROVE_OPTS = $makejobs
 	# firstword (uname -m)
 	HOST_CPU = ${XBPS_TARGET_MACHINE%-musl}
+	# this flag will skip shipping unneeded symlinks
+	# those symlinks were kept for scripts written before 2010
+	SKIP_DASHED_BUILT_INS = Yes
 	EOF
 
 	if [ "$XBPS_TARGET_LIBC" = musl ]; then
@@ -51,8 +55,7 @@ do_configure() {
 }
 
 do_build() {
-	make ${makejobs}
-	make ${makejobs} -C Documentation man
+	make ${makejobs} all man
 	make ${makejobs} -C contrib/contacts all git-contacts.1
 	make ${makejobs} -C contrib/diff-highlight all
 	make ${makejobs} -C contrib/subtree all man
@@ -68,7 +71,7 @@ do_check() {
 }
 
 do_install() {
-	make DESTDIR=${DESTDIR} install install-doc
+	make DESTDIR=${DESTDIR} install install-man
 	vinstall contrib/completion/git-completion.bash 644 \
 		usr/share/bash-completion/completions git
 	vinstall contrib/completion/git-prompt.sh 644 usr/share/git
@@ -83,6 +86,16 @@ do_install() {
 	make -C contrib/credential/netrc DESTDIR=${DESTDIR} install
 }
 
+git-scalar_package() {
+	depends="git"
+	short_desc="Tool for managing large Git repositories"
+	pkg_install() {
+		vmove usr/bin/scalar
+		vmove usr/libexec/git-core/scalar
+		vmove usr/share/man/man1/scalar.1
+	}
+}
+
 git-cvs_package() {
 	depends="${sourcepkg}-${version}_${revision} cvs cvsps2 perl-DBD-SQLite"
 	short_desc+=" - CVS support"