Customization/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-11-25 07:10:08 +00:00
Code Releases Activity

updater: use git config instead of git -c for git < v1.7.2

Browse source 
Fixes #8732
This commit is contained in:
Marc Cornellà 2020-03-11 14:17:41 +01:00
parent 7900380239
commit 6ba2d9de3d
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
tools/upgrade.sh
View file

@ -30,6 +30,9 @@ git config core.autocrlf false
git config fsck.zeroPaddedFilemode ignore git config fsck.zeroPaddedFilemode ignore
git config fetch.fsck.zeroPaddedFilemode ignore git config fetch.fsck.zeroPaddedFilemode ignore
git config receive.fsck.zeroPaddedFilemode ignore git config receive.fsck.zeroPaddedFilemode ignore
# autostash on rebase (#7172)
resetAutoStash=$(git config --bool rebase.autoStash 2>&1)
git config rebase.autoStash true
# Update upstream remote to ohmyzsh org # Update upstream remote to ohmyzsh org
remote=$(git remote -v | awk '/https:\/\/github\.com\/robbyrussell\/oh-my-zsh\.git/{ print $1; exit }') remote=$(git remote -v | awk '/https:\/\/github\.com\/robbyrussell\/oh-my-zsh\.git/{ print $1; exit }')
@ -38,7 +41,7 @@ if [ -n "$remote" ]; then
fi fi
printf "${BLUE}%s${NORMAL}\n" "Updating Oh My Zsh" printf "${BLUE}%s${NORMAL}\n" "Updating Oh My Zsh"
if git -c rebase.autoStash=true pull --rebase --stat origin master if git pull --rebase --stat origin master
then then
printf '%s' "$GREEN" printf '%s' "$GREEN"
printf '%s\n' ' __ __ ' printf '%s\n' ' __ __ '
@ -53,3 +56,9 @@ then
else else
printf "${RED}%s${NORMAL}\n" 'There was an error updating. Try again later?' printf "${RED}%s${NORMAL}\n" 'There was an error updating. Try again later?'
fi fi
# Unset git-config values set just for the upgrade
case "$resetAutoStash" in
"") git config --unset rebase.autoStash ;;
*) git config rebase.autoStash "$resetAutoStash" ;;
esac