From a8f4d64774bde88410ce8aef454db9a6f3fb37e9 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 16 Dec 2022 04:59:55 -0500
Subject: [PATCH 1/7] common/travis/fetch_upstream: clean up

---
 common/travis/fetch_upstream.sh | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/common/travis/fetch_upstream.sh b/common/travis/fetch_upstream.sh
index e5ec5979493b..0813e0acedbc 100755
--- a/common/travis/fetch_upstream.sh
+++ b/common/travis/fetch_upstream.sh
@@ -1,9 +1,6 @@
 #!/bin/sh
 #
-# changed_templates.sh
-
-# required by git 2.35.2+
-git config --global --add safe.directory "$PWD"
+# fetch_upstream.sh
 
 /bin/echo -e '\x1b[32mFetching upstream...\x1b[0m'
 git fetch --depth 200 https://github.com/void-linux/void-packages.git master

From 21b17e8a8435cdf7a700d993bbf2e0e6655dd2d4 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 16 Dec 2022 05:00:52 -0500
Subject: [PATCH 2/7] .github/workflows: use checkout script instead of action

also fix indentation in cycle check
---
 .github/workflows/build.yaml | 24 ++++++++++++++-----
 .github/workflows/cycles.yml | 45 +++++++++++++++++++++---------------
 2 files changed, 44 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 95f1cd88e338..12b7f0e1f0dd 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -26,9 +26,15 @@ jobs:
       LICENSE_LIST: common/travis/license.lst
 
     steps:
-      - uses: actions/checkout@v1
-        with:
-          fetch-depth: 200
+      - name: Clone and checkout
+        run: |
+         /bin/echo -e '\x1b[32mCloning repository...\x1b[0m'
+         # https://github.blog/2020-12-21-get-up-to-speed-with-partial-clone-and-shallow-clone/
+         git clone --filter=tree:0 ${{ github.server_url }}/${{ github.repository }}.git
+         git checkout ${{ github.ref_name }}
+
+         # required by git 2.35.2+
+         git config --global --add safe.directory "$PWD"
       - run: common/travis/fetch_upstream.sh
       - run: common/travis/changed_templates.sh
       - run: common/travis/fetch-xbps.sh
@@ -73,9 +79,15 @@ jobs:
           # Upgrade again (in case there was a xbps update)
           xbps-install -yu
 
-      - uses: actions/checkout@v1
-        with:
-          fetch-depth: 200
+      - name: Clone and checkout
+        run: |
+         /bin/echo -e '\x1b[32mCloning repository...\x1b[0m'
+         # https://github.blog/2020-12-21-get-up-to-speed-with-partial-clone-and-shallow-clone/
+         git clone --filter=tree:0 ${{ github.server_url }}/${{ github.repository }}.git
+         git checkout ${{ github.ref_name }}
+
+         # required by git 2.35.2+
+         git config --global --add safe.directory "$PWD"
       - name: Create hostrepo and prepare masterdir
         run: |
          ln -s "$(pwd)" /hostrepo &&
diff --git a/.github/workflows/cycles.yml b/.github/workflows/cycles.yml
index 7d781076dbe9..e7ecb5075837 100644
--- a/.github/workflows/cycles.yml
+++ b/.github/workflows/cycles.yml
@@ -10,7 +10,9 @@ jobs:
     permissions:
       issues: write
     container:
-        image: 'ghcr.io/void-linux/xbps-src-masterdir:20220527RC01-x86_64-musl'
+      image: 'ghcr.io/void-linux/xbps-src-masterdir:20220527RC01-x86_64-musl'
+      env:
+        PATH: '/usr/libexec/chroot-git:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/usr/local/bin:/tmp/bin'
     steps:
       - name: Prepare container
         run: |
@@ -23,26 +25,31 @@ jobs:
           xbps-install -yu
           # Install script dependencies
           xbps-install -y python3-networkx github-cli
-      - uses: actions/checkout@v1
-        with:
-          fetch-depth: 1
+
+      - name: Clone and checkout
+        run: |
+         /bin/echo -e '\x1b[32mCloning repository...\x1b[0m'
+         # https://github.blog/2020-12-21-get-up-to-speed-with-partial-clone-and-shallow-clone/
+         git clone --filter=tree:0 ${{ github.server_url }}/${{ github.repository }}.git
+         git checkout ${{ github.ref_name }}
+
+         # required by git 2.35.2+
+         git config --global --add safe.directory "$PWD"
+
       - name: Create hostrepo and prepare masterdir
         run: |
-         ln -s "$(pwd)" /hostrepo &&
-         common/travis/set_mirror.sh &&
-         common/travis/prepare.sh
+          ln -s "$(pwd)" /hostrepo &&
+          common/travis/set_mirror.sh &&
+          common/travis/prepare.sh
       - name: Find cycles and open issues
         run: |
-         PATH="/usr/libexec/chroot-git:$PATH"
-         # required by git 2.35.2+
-         git config --global --add safe.directory "$PWD"
-         common/scripts/xbps-cycles.py | tee cycles
-         grep 'Cycle:' cycles | while read -r line; do
-             if gh issue list -R "$GITHUB_REPOSITORY" -S "$line" | grep .; then
-                 printf "Issue on '%s' already exists.\n" "$line"
-             else
-                 gh issue create -R "$GITHUB_REPOSITORY" -b '' -t "$line"
-             fi
-         done
+          common/scripts/xbps-cycles.py | tee cycles
+          grep 'Cycle:' cycles | while read -r line; do
+              if gh issue list -R "$GITHUB_REPOSITORY" -S "$line" | grep .; then
+                  printf "Issue on '%s' already exists.\n" "$line"
+              else
+                  gh issue create -R "$GITHUB_REPOSITORY" -b '' -t "$line"
+              fi
+          done
         env:
-            GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN }}

From 8f305f7d51b82d1d8d1285f035a72c4fc5548d87 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 16 Dec 2022 05:01:46 -0500
Subject: [PATCH 3/7] TEST COMMIT PLS IGNORE

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

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

From 8b7ad6f6d1aa49affe884c81541a8c54f9698f0b Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 16 Dec 2022 05:20:55 -0500
Subject: [PATCH 4/7] fixup! .github/workflows: use checkout script instead of
 action

---
 .github/workflows/build.yaml | 6 ++++--
 .github/workflows/cycles.yml | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 12b7f0e1f0dd..aa52dd5292fc 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -31,7 +31,8 @@ jobs:
          /bin/echo -e '\x1b[32mCloning repository...\x1b[0m'
          # https://github.blog/2020-12-21-get-up-to-speed-with-partial-clone-and-shallow-clone/
          git clone --filter=tree:0 ${{ github.server_url }}/${{ github.repository }}.git
-         git checkout ${{ github.ref_name }}
+         cd void-packages
+         git checkout ${{ github.ref }}
 
          # required by git 2.35.2+
          git config --global --add safe.directory "$PWD"
@@ -84,7 +85,8 @@ jobs:
          /bin/echo -e '\x1b[32mCloning repository...\x1b[0m'
          # https://github.blog/2020-12-21-get-up-to-speed-with-partial-clone-and-shallow-clone/
          git clone --filter=tree:0 ${{ github.server_url }}/${{ github.repository }}.git
-         git checkout ${{ github.ref_name }}
+         cd void-packages
+         git checkout ${{ github.ref }}
 
          # required by git 2.35.2+
          git config --global --add safe.directory "$PWD"
diff --git a/.github/workflows/cycles.yml b/.github/workflows/cycles.yml
index e7ecb5075837..6631b2a2b3d5 100644
--- a/.github/workflows/cycles.yml
+++ b/.github/workflows/cycles.yml
@@ -31,7 +31,8 @@ jobs:
          /bin/echo -e '\x1b[32mCloning repository...\x1b[0m'
          # https://github.blog/2020-12-21-get-up-to-speed-with-partial-clone-and-shallow-clone/
          git clone --filter=tree:0 ${{ github.server_url }}/${{ github.repository }}.git
-         git checkout ${{ github.ref_name }}
+         cd void-packages
+         git checkout ${{ github.ref }}
 
          # required by git 2.35.2+
          git config --global --add safe.directory "$PWD"

From ccc306d7de717c5265865cde386344d3afc910be Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 16 Dec 2022 05:32:33 -0500
Subject: [PATCH 5/7] fixup! fixup! .github/workflows: use checkout script
 instead of action

---
 .github/workflows/build.yaml | 10 ++++++++--
 .github/workflows/cycles.yml |  5 ++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index aa52dd5292fc..5408b6efc3ea 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -30,8 +30,11 @@ jobs:
         run: |
          /bin/echo -e '\x1b[32mCloning repository...\x1b[0m'
          # https://github.blog/2020-12-21-get-up-to-speed-with-partial-clone-and-shallow-clone/
-         git clone --filter=tree:0 ${{ github.server_url }}/${{ github.repository }}.git
+         git clone --filter=tree:0 ${{ github.server_url }}/${{ github.repository }}
          cd void-packages
+         git fetch --prune --progress --depth=200 origin \
+             +refs/heads/*:refs/remotes/origin/* \
+             +${{ github.ref }}:refs/remotes/pull/${{ github.ref_name }}
          git checkout ${{ github.ref }}
 
          # required by git 2.35.2+
@@ -84,8 +87,11 @@ jobs:
         run: |
          /bin/echo -e '\x1b[32mCloning repository...\x1b[0m'
          # https://github.blog/2020-12-21-get-up-to-speed-with-partial-clone-and-shallow-clone/
-         git clone --filter=tree:0 ${{ github.server_url }}/${{ github.repository }}.git
+         git clone --filter=tree:0 ${{ github.server_url }}/${{ github.repository }}
          cd void-packages
+         git fetch --prune --progress --depth=200 origin \
+             +refs/heads/*:refs/remotes/origin/* \
+             +${{ github.ref }}:refs/remotes/pull/${{ github.ref_name }}
          git checkout ${{ github.ref }}
 
          # required by git 2.35.2+
diff --git a/.github/workflows/cycles.yml b/.github/workflows/cycles.yml
index 6631b2a2b3d5..aee27509014e 100644
--- a/.github/workflows/cycles.yml
+++ b/.github/workflows/cycles.yml
@@ -30,8 +30,11 @@ jobs:
         run: |
          /bin/echo -e '\x1b[32mCloning repository...\x1b[0m'
          # https://github.blog/2020-12-21-get-up-to-speed-with-partial-clone-and-shallow-clone/
-         git clone --filter=tree:0 ${{ github.server_url }}/${{ github.repository }}.git
+         git clone --filter=tree:0 ${{ github.server_url }}/${{ github.repository }}
          cd void-packages
+         git fetch --prune --progress --depth=200 origin \
+             +refs/heads/*:refs/remotes/origin/* \
+             +${{ github.ref }}:refs/remotes/pull/${{ github.ref_name }}
          git checkout ${{ github.ref }}
 
          # required by git 2.35.2+

From 210fcee79565cbe42a9077d93cc1b4b9c2711e8f Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 16 Dec 2022 05:36:25 -0500
Subject: [PATCH 6/7] fixup! fixup! fixup! .github/workflows: use checkout
 script instead of action

---
 .github/workflows/build.yaml | 4 ++--
 .github/workflows/cycles.yml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 5408b6efc3ea..e2377c861e72 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -35,7 +35,7 @@ jobs:
          git fetch --prune --progress --depth=200 origin \
              +refs/heads/*:refs/remotes/origin/* \
              +${{ github.ref }}:refs/remotes/pull/${{ github.ref_name }}
-         git checkout ${{ github.ref }}
+         git checkout --progress --force refs/remotes/pull/${{ github.ref_name }}
 
          # required by git 2.35.2+
          git config --global --add safe.directory "$PWD"
@@ -92,7 +92,7 @@ jobs:
          git fetch --prune --progress --depth=200 origin \
              +refs/heads/*:refs/remotes/origin/* \
              +${{ github.ref }}:refs/remotes/pull/${{ github.ref_name }}
-         git checkout ${{ github.ref }}
+         git checkout --progress --force refs/remotes/pull/${{ github.ref_name }}
 
          # required by git 2.35.2+
          git config --global --add safe.directory "$PWD"
diff --git a/.github/workflows/cycles.yml b/.github/workflows/cycles.yml
index aee27509014e..578340d1a993 100644
--- a/.github/workflows/cycles.yml
+++ b/.github/workflows/cycles.yml
@@ -35,7 +35,7 @@ jobs:
          git fetch --prune --progress --depth=200 origin \
              +refs/heads/*:refs/remotes/origin/* \
              +${{ github.ref }}:refs/remotes/pull/${{ github.ref_name }}
-         git checkout ${{ github.ref }}
+         git checkout --progress --force refs/remotes/pull/${{ github.ref_name }}
 
          # required by git 2.35.2+
          git config --global --add safe.directory "$PWD"

From 9f95b0f4438d0be3837a2a6a3a9f8042c1719ff1 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 16 Dec 2022 05:46:39 -0500
Subject: [PATCH 7/7] fixup! fixup! fixup! fixup! .github/workflows: use
 checkout script instead of action

---
 .github/workflows/build.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index e2377c861e72..1cb4de74191d 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -28,6 +28,7 @@ jobs:
     steps:
       - name: Clone and checkout
         run: |
+         echo $PWD
          /bin/echo -e '\x1b[32mCloning repository...\x1b[0m'
          # https://github.blog/2020-12-21-get-up-to-speed-with-partial-clone-and-shallow-clone/
          git clone --filter=tree:0 ${{ github.server_url }}/${{ github.repository }}