Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
adam.huang
Oh My Zsh
Commits
a55a30ec
Unverified
Commit
a55a30ec
authored
Sep 09, 2020
by
Lucas Larson
Committed by
GitHub
Sep 09, 2020
Browse files
update: return git error code on failure (#9238)
Fixes #9237
parent
708ea423
Changes
1
Hide whitespace changes
Inline
Side-by-side
tools/upgrade.sh
View file @
a55a30ec
...
@@ -68,6 +68,7 @@ then
...
@@ -68,6 +68,7 @@ then
printf
"
${
BLUE
}${
BOLD
}
%s
${
UNDER
}
%s
${
RESET
}
\n
"
"Want to get involved in the community? Join our Discord:"
"https://discord.gg/ohmyzsh"
printf
"
${
BLUE
}${
BOLD
}
%s
${
UNDER
}
%s
${
RESET
}
\n
"
"Want to get involved in the community? Join our Discord:"
"https://discord.gg/ohmyzsh"
printf
"
${
BLUE
}${
BOLD
}
%s
${
UNDER
}
%s
${
RESET
}
\n
"
"Get your Oh My Zsh swag at:"
"https://shop.planetargon.com/collections/oh-my-zsh"
printf
"
${
BLUE
}${
BOLD
}
%s
${
UNDER
}
%s
${
RESET
}
\n
"
"Get your Oh My Zsh swag at:"
"https://shop.planetargon.com/collections/oh-my-zsh"
else
else
status
=
$?
printf
"
${
RED
}
%s
${
RESET
}
\n
"
'There was an error updating. Try again later?'
printf
"
${
RED
}
%s
${
RESET
}
\n
"
'There was an error updating. Try again later?'
fi
fi
...
@@ -76,3 +77,6 @@ case "$resetAutoStash" in
...
@@ -76,3 +77,6 @@ case "$resetAutoStash" in
""
)
git config
--unset
rebase.autoStash
;;
""
)
git config
--unset
rebase.autoStash
;;
*
)
git config rebase.autoStash
"
$resetAutoStash
"
;;
*
)
git config rebase.autoStash
"
$resetAutoStash
"
;;
esac
esac
# Exit with `1` if the update failed
exit
$status
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