linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-12-19 20:29:45 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor(cli): fix commit.gpgsign test in omz pr test

Browse source
This commit is contained in:
Marc Cornellà 2022-04-14 12:13:53 +02:00
parent f1a5fb5ee9
commit 30e23a643b
No known key found for this signature in database
GPG key ID: 0314585E776A9C1B
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/cli.zsh
View file

@ -573,14 +573,13 @@ function _omz::pr::test {
# Rebase pull request branch against the current master # Rebase pull request branch against the current master
_omz::log info "rebasing PR #$1..." _omz::log info "rebasing PR #$1..."
local gpgsign local ret gpgsign
{ {
# Back up commit.gpgsign setting: use --local to get the current repository # 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 # setting, not the global one. If --local is not a known option, it will
# exit with a 129 status code. # exit with a 129 status code.
if ! gpgsign=$(command git config --local commit.gpgsign 2>/dev/null); then gpgsign=$(command git config --local commit.gpgsign 2>/dev/null) || ret=$?
[[ $? -ne 129 ]] || gpgsign=$(command git config commit.gpgsign 2>/dev/null) [[ $ret -ne 129 ]] || gpgsign=$(command git config commit.gpgsign 2>/dev/null)
fi
command git config commit.gpgsign false command git config commit.gpgsign false
command git rebase master ohmyzsh/pull-$1 || { command git rebase master ohmyzsh/pull-$1 || {