linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-03-06 03:10:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 14a6b0d3d9 into 5292fea2ba

Browse source
This commit is contained in:
Bernie Green 2026-03-05 12:55:46 -05:00 • committed by GitHub
commit 52f99d10c4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 1 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tools/upgrade.sh
View file

@ -1,7 +1,7 @@
#!/usr/bin/env zsh #!/usr/bin/env zsh
set +u # disable nounset set +u # disable nounset
local ret=0 # exit code ret=0 # exit code
# Protect against running with shells other than zsh # Protect against running with shells other than zsh
if [ -z "$ZSH_VERSION" ]; then if [ -z "$ZSH_VERSION" ]; then
@ -225,8 +225,6 @@ git config receive.fsck.zeroPaddedFilemode ignore
resetAutoStash=$(git config --bool rebase.autoStash 2>/dev/null) resetAutoStash=$(git config --bool rebase.autoStash 2>/dev/null)
git config rebase.autoStash true git config rebase.autoStash true
local ret=0
# repository settings # repository settings
remote=${"$(git config --local oh-my-zsh.remote)":-origin} remote=${"$(git config --local oh-my-zsh.remote)":-origin}
branch=${"$(git config --local oh-my-zsh.branch)":-master} branch=${"$(git config --local oh-my-zsh.branch)":-master}