From 63b0a751ede36912b35aafe181b7772bfcf03f36 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 9 Oct 2022 01:49:22 -0400
Subject: [PATCH 1/3] .github/workflows/build.yaml: add /usr/libexec/chroot-git
 to PATH

---
 .github/workflows/build.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index ce995e2d9c79..95f1cd88e338 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-latest
 
     env:
-      PATH: '/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/usr/local/bin:/tmp/bin'
+      PATH: '/usr/libexec/chroot-git:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/usr/local/bin:/tmp/bin'
       XLINT: '1'
       LICENSE_LIST: common/travis/license.lst
 
@@ -44,7 +44,7 @@ jobs:
     container:
       image: 'ghcr.io/void-linux/xbps-src-masterdir:20220527RC01-${{ matrix.config.bootstrap }}'
       env:
-        PATH: '/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/usr/local/bin:/tmp/bin'
+        PATH: '/usr/libexec/chroot-git:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/usr/local/bin:/tmp/bin'
         ARCH: '${{ matrix.config.arch }}'
         BOOTSTRAP: '${{ matrix.config.bootstrap }}'
         TEST: '${{ matrix.config.test }}'

From ef4ef5afa22f1fae79bed152713ca04e45d0a62a Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 9 Oct 2022 01:51:18 -0400
Subject: [PATCH 2/3] common/: remove PATH adds from CI scripts

they are now specified in the workflow file
---
 common/scripts/lint-commits        | 1 -
 common/scripts/lint-version-change | 1 -
 common/travis/changed_templates.sh | 2 --
 common/travis/fetch_upstream.sh    | 2 --
 4 files changed, 6 deletions(-)

diff --git a/common/scripts/lint-commits b/common/scripts/lint-commits
index f372deb820af..6aea99d51154 100755
--- a/common/scripts/lint-commits
+++ b/common/scripts/lint-commits
@@ -5,7 +5,6 @@ die() {
 	exit 1
 }
 
-PATH="/usr/libexec/chroot-git:$PATH"
 command -v git >/dev/null 2>&1 ||
 die "neither chroot-git nor git could be found!"
 
diff --git a/common/scripts/lint-version-change b/common/scripts/lint-version-change
index facba3957c4a..f900d90224d3 100755
--- a/common/scripts/lint-version-change
+++ b/common/scripts/lint-version-change
@@ -13,7 +13,6 @@ if ! [ "$base_rev" ]; then
 	die "usage: $0 TEMPLATE BASE-REVISION [TIP-REVISION]"
 fi
 
-PATH="/usr/libexec/chroot-git:$PATH"
 if ! command -v git >/dev/null 2>&1; then
 	die "neither chroot-git nor git could be found"
 fi
diff --git a/common/travis/changed_templates.sh b/common/travis/changed_templates.sh
index 534cd97a12b1..2bed2250ae71 100755
--- a/common/travis/changed_templates.sh
+++ b/common/travis/changed_templates.sh
@@ -2,8 +2,6 @@
 #
 # changed_templates.sh
 
-PATH="/usr/libexec/chroot-git:$PATH"
-
 tip="$(git rev-list -1 --parents HEAD)"
 case "$tip" in
 	# This is a merge commit, pick last parent
diff --git a/common/travis/fetch_upstream.sh b/common/travis/fetch_upstream.sh
index 40c136f3857c..e5ec5979493b 100755
--- a/common/travis/fetch_upstream.sh
+++ b/common/travis/fetch_upstream.sh
@@ -2,8 +2,6 @@
 #
 # changed_templates.sh
 
-PATH="/usr/libexec/chroot-git:$PATH"
-
 # required by git 2.35.2+
 git config --global --add safe.directory "$PWD"
 

From 10e981061a8a7bb3d0925ddcbed82531c7c9d358 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 9 Oct 2022 01:53:03 -0400
Subject: [PATCH 3/3] tmp

---
 srcpkgs/chezmoi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index 79189d3580f5..ffa2aae870c0 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,7 +1,7 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
 version=2.24.0
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/twpayne/chezmoi/v2"
 go_build_tags="noembeddocs noupgrade"