Support git 2.0's new default push.branch mode of 'simple' rather than 'matching'. SourceTree will detect what version of git you're running and will reflect the default for that version if you haven't explicitly chosen a mode. SourceTree will no longer auto-refresh when changes are detected inside ignored directories. SourceTree suffers from multiple remote code execution vulnerabilities that can be triggered via hostile repositories being checked in. SourceTree for macOS versions prior to 2.6.1 and SourceTree for Windows versions prior to 2.1.10 are affected.
Sourcetree Macos 10.13.6
I finally got around to setting up two-factor authentication on my Github account. The process went quite smoothly, until I started to play around with SourceTree and I found out that I was unable to push commits to a git repo.
SourceTree error
The error message that I was receiving seemed pretty generic at the time. Besides I knew I was typing my Github password correctly, so that could not be the issue. In hindsight not realizing the two-factor authentication (2fa) was the problem immediately was pretty stupid. The solution to this error is to login with a One Time Password (OTP) token not your normal Github password. If you do use the wrong password you will receive the follow error message.
Note: If you use the official GitHub app you will not run into a login error because their app uses the GitHub API for authentication.
Luckily Github has made creating a OTP quite easy once you know what you are looking for. It is recommended practice to use one token per application. This means if I ever need to reject a token it will only effect the one version of SourceTree on one device.
Below are the steps needed to create your OTP token and re-add your Github account in SourceTree.
Setting up the OTP
To create the OTP, use the following link. Click on “Generate New Token”.
Give your OTP a Token description. Make sure at least the “repo” and “public_repo” options are checked. Click “Generate token”.
Configuration for SourceTree
If you already have SourceTree setup, you will need to edit your account password for GitHub. You can accomplish this by opening the Bookmarks window and clicking on the “Hosted Repositories” button.
Now you need to click on “Edit Accounts…” so you can select your Github account and make modifications.
Click on “Set Password”.
Sourcetree 10.13 Download
In the Authenticate window make sure and use your newly generated OTP token as your password. I recommend saving the password in your keychain.
Articles: atlassian KB,Ryan Sechrest
Updated: May 15th, 2014 - Add KB link from atlassian. Per
@clburlison Thanks Clayton. I did a KB (https://t.co/Ql7mjXeXDy) too. Yours has pictures though so easier to read. Could you link to the KB?
— Kieran Senior 🇬🇬 (@kieransenior) May 15, 2014Sourcetree Macos 10.13
It is always a bit of fraught process upgrading a computer OS, especially for a development machine with loads of tools and libraries installed. So I try to do it as infrequently as I can get away with. On Windows I generally buy a new PC rather than upgrade OS. However glitches had been reported in Easy Data Transform on macOS 11.0 (Big Sur) and I wasn’t ready to abandon my 2017 iMac, so I decided to bite the bullet and upgrade it from macOS 10.13 to 11.0.
The initial upgrade of OS was straightforward enough. But when I tried to run Qt Creator the CPU shot to 99% and stayed there, making the machine unusable. A glance at Activity Monitor showed that several XCode related processes were going crazy. After a bit a Googling I managed to find this magic incantation to type into the terminal on a forum post:
I was then able to rebuild my Qt-based products: Easy Data Transform, PerfectTablePlan and Hyper Plan using the existing installs of Qt 5.13.1 and Qt Creator 4.8.0.
Sourcetree 10.12
I had to update some of the software I use:
Sourcetree Macos 10.13.6
- DropDMG
- Beyond Compare
- SnagIt
Annoyingly, I had to buy an upgrade of SnagIt as the 2018 version doesn’t work on Big Sur. Even more annoyingly the upgrade costs nearly as much as a new licence, which feels predatory.
The Subversion command line no longer worked from the terminal, but that was easily fixed by adding /Applications/XCode.app/Developer/usr/bin to PATH in my .profile.
So far I haven’t been able to get the following to work:
- XCode
- Hammer4Mac
XCode 10.1 falls over if I try to start it. It says that it requires additional components and then fails to install them. I may upgrade XCode at some point. But I only use the compiler from the command line via QtCreator, so it doesn’t really matter at present.
Hammer4Mac is a static website builder I use to build the PerfectTablePlan website and a couple of other mini sites. I upgraded to the latest version. It starts, but returns ‘Build failed’ for all 3 websites. No clue as to why. I Tweeted the creator, but got no reply. It appears to be abandonware. If so they should really take down the Hammer4Mac website. I guess I will use it from my macOS 10.14 laptop and then eventually do the tedious job of porting those websites to Jekyll.
Hopefully I won’t have to do another major upgrade of macOS any time soon (I may buy a new Mac next time).