Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
oh-my-zsh
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
github
oh-my-zsh
Commits
141d06b6
Unverified
Commit
141d06b6
authored
Mar 31, 2022
by
Carlo Sala
Committed by
GitHub
Mar 31, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(cli): turn of `commit.gpgsign` compatibly with git v1.7.1 (#10679)
Co-authored-by:
Marc Cornellà
<
hello@mcornella.com
>
parent
93435bff
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
21 additions
and
6 deletions
+21
-6
cli.zsh
lib/cli.zsh
+21
-6
No files found.
lib/cli.zsh
View file @
141d06b6
...
@@ -573,13 +573,28 @@ function _omz::pr::test {
...
@@ -573,13 +573,28 @@ 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
..."
command
git rebase
--no-gpg-sign
master ohmyzsh/pull-
$1
||
{
local
gpgsign
{
# 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
)
command
git config commit.gpgsign
false
command
git rebase master ohmyzsh/pull-
$1
||
{
command
git rebase
--abort
&>/dev/null
command
git rebase
--abort
&>/dev/null
_omz::log warn
"could not rebase PR #
$1
on top of master."
_omz::log warn
"could not rebase PR #
$1
on top of master."
_omz::log warn
"you might not see the latest stable changes."
_omz::log warn
"you might not see the latest stable changes."
_omz::log info
"run
\`
zsh
\`
to test the changes."
_omz::log info
"run
\`
zsh
\`
to test the changes."
return
1
return
1
}
}
}
always
{
case
"
$gpgsign
"
in
""
)
command
git config
--unset
commit.gpgsign
;;
*
)
command
git config commit.gpgsign
"
$gpgsign
"
;;
esac
}
_omz::log info
"fetch of PR #
${
1
}
successful."
_omz::log info
"fetch of PR #
${
1
}
successful."
)
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment