After you've upgraded your OS, open up a terminal and do the following:
-
Change your shell back to bash
sudo chsh -s /bin/bash `whoami`
-
Re-install xcode
xcode-select --install
-
Log out (Command + Shift + Q) and log back in
And you should be good to go