From 1971ae9f51e3cc38ee05dcfde63dd5aa3a3e42ba Mon Sep 17 00:00:00 2001
From: Anish Athalye <me@anishathalye.com>
Date: Thu, 17 Nov 2022 10:23:43 -0500
Subject: [PATCH 1/4] Add workaround for test broken by Git security fix

The fix for this Git security issue [1] involved disabling the local
clone optimization when the repository contains symbolic links. The
security fix broke this particular test; this patch works around the
fix.

[1]: https://github.com/git/git/security/advisories/GHSA-3wp6-j8xr-qw85
---
 test/tests/shim.bash | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/tests/shim.bash b/test/tests/shim.bash
index ddacae3..126c047 100644
--- a/test/tests/shim.bash
+++ b/test/tests/shim.bash
@@ -2,6 +2,7 @@ test_description='install shim works'
 . '../test-lib.bash'
 
 test_expect_success 'setup' '
+git config --global protocol.file.allow always
 cd ${DOTFILES}
 git init
 git submodule add ${BASEDIR} dotbot

From 76ccc53eeef119fdc50645bf127ad636d380221a Mon Sep 17 00:00:00 2001
From: Arbaaz Shafiq <arbaazshafiq@gmail.com>
Date: Wed, 26 Oct 2022 19:30:34 +0530
Subject: [PATCH 2/4] Don't show command if quiet: true

Don't print the command if quiet option is set to true and no
description is given.
---
 dotbot/plugins/shell.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/dotbot/plugins/shell.py b/dotbot/plugins/shell.py
index bbdcb6d..7092158 100644
--- a/dotbot/plugins/shell.py
+++ b/dotbot/plugins/shell.py
@@ -42,10 +42,11 @@ class Shell(dotbot.Plugin):
             else:
                 cmd = item
                 msg = None
-            if msg is None:
+            if quiet:
+                if msg is not None:
+                    self._log.lowinfo("%s" % msg)
+            elif msg is None:
                 self._log.lowinfo(cmd)
-            elif quiet:
-                self._log.lowinfo("%s" % msg)
             else:
                 self._log.lowinfo("%s [%s]" % (msg, cmd))
             stdout = options.get("stdout", stdout)

From 5d34d005e8e0c81bace65a7c2d168985bc17018b Mon Sep 17 00:00:00 2001
From: Anish Athalye <me@anishathalye.com>
Date: Thu, 17 Nov 2022 13:26:32 -0500
Subject: [PATCH 3/4] Fix test

---
 test/tests/shell-quiet.bash | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/tests/shell-quiet.bash b/test/tests/shell-quiet.bash
index a69f6c5..78309bc 100644
--- a/test/tests/shell-quiet.bash
+++ b/test/tests/shell-quiet.bash
@@ -20,9 +20,9 @@ test_expect_success 'run 2' '
 EOF
 '
 
-# when no description, expect to see command
+# when no description, expect no output
 test_expect_success 'run 3' '
-(run_dotbot | grep "echo banana") <<EOF
+(run_dotbot | (! grep "echo banana")) <<EOF
 - shell:
   - command: echo banana
     quiet: true

From 860a56580b43ec663eb8c5d761eb25455cea51b8 Mon Sep 17 00:00:00 2001
From: Anish Athalye <me@anishathalye.com>
Date: Sun, 11 Dec 2022 10:49:55 -0500
Subject: [PATCH 4/4] Fix CI

---
 .github/workflows/build.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a77ff1e..7ee2182 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -6,22 +6,22 @@ on:
     - cron: '0 8 * * 6'
 jobs:
   test:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     strategy:
       matrix:
-        python: ["2.7", "pypy2", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10", "pypy3"]
+        python: ["2.7", "pypy2.7", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10", "pypy3.9"]
     name: "Test: Python ${{ matrix.python }}"
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           submodules: recursive
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python }}
       - run: ./test/test
   fmt:
     name: Format
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: psf/black@stable