diff --git a/lib/cli.zsh b/lib/cli.zsh
index bf783d9f3..56d5b91de 100644
--- a/lib/cli.zsh
+++ b/lib/cli.zsh
@@ -578,8 +578,9 @@ function _omz::pr::test {
       # Back up commit.gpgsign setting: use --local to get the current repository
       # setting, not the global one. If --local is not a known option, it will
       # exit with a 129 status code.
-      gpgsign=$(command git config --local commit.gpgsign 2>/dev/null)
-      [[ $? -ne 129 ]] || gpgsign=$(command git config commit.gpgsign 2>/dev/null)
+      if ! gpgsign=$(command git config --local commit.gpgsign 2>/dev/null); then
+        [[ $? -ne 129 ]] || gpgsign=$(command git config commit.gpgsign 2>/dev/null)
+      fi
       command git config commit.gpgsign false
 
       command git rebase master ohmyzsh/pull-$1 || {