From 73b1307264f574c34d38af1207ead8333a9b5443 Mon Sep 17 00:00:00 2001 From: abc Date: Fri, 7 Apr 2023 16:41:35 +0800 Subject: [PATCH] merge --- tools/upgrade.sh | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/tools/upgrade.sh b/tools/upgrade.sh index 6786bda32..c350a3573 100755 --- a/tools/upgrade.sh +++ b/tools/upgrade.sh @@ -181,20 +181,26 @@ if is_tty; then fi # Update upstream remote to ohmyzsh org -#git remote -v | while read remote url extra; do - #case "$url" in - #https://github.com/snakewarhead/oh-my-zsh(|.git)) - #git remote set-url upstream "https://github.com/ohmyzsh/ohmyzsh.git" - #break ;; - #git@github.com:snakewarhead/oh-my-zsh(|.git)) - #git remote set-url upstream "git@github.com:ohmyzsh/ohmyzsh.git" - #break ;; - ## Update out-of-date "unauthenticated git protocol on port 9418" to https - #git://github.com/snakewarhead/oh-my-zsh(|.git)) - #git remote set-url upstream "https://github.com/ohmyzsh/ohmyzsh.git" - #break ;; - #esac -#done +# git remote -v | while read remote url extra; do +# case "$url" in +# git://github.com/robbyrussell/oh-my-zsh(|.git)) +# # Update out-of-date "unauthenticated git protocol on port 9418" to https +# git remote set-url "$remote" "https://github.com/ohmyzsh/ohmyzsh.git" ;; +# https://github.com/robbyrussell/oh-my-zsh(|.git)) +# git remote set-url "$remote" "https://github.com/ohmyzsh/ohmyzsh.git" ;; +# git@github.com:robbyrussell/oh-my-zsh(|.git)) +# git remote set-url "$remote" "git@github.com:ohmyzsh/ohmyzsh.git" ;; +# https://github.com/ohmyzsh/ohmyzsh(|.git)) ;; +# git@github.com:ohmyzsh/ohmyzsh(|.git)) ;; +# *) continue ;; +# esac + +# # If we reach this point we have found the proper ohmyzsh upstream remote. If we don't, +# # we'll only update from the set remote if `oh-my-zsh.remote` has been set to a remote, +# # as when installing from a fork. +# git config --local oh-my-zsh.remote "$remote" +# break +# done # Set git-config values known to fix git errors # Line endings (#4069)