Just a short list of things I had to do during my sierra upgrade to get back to ship shape.
Accept the new xcode license so you can use git etc:
sudo xcodebuild -license
Take control of /usr/local
again. You may not need to do this if you have a more recent homebrew than I did. homebrew now lives in /usr/local/Homebrew
: