That link is essentially what I am using now. However in order for it to work, you modify the .htaccess code. Since I’m only using .htaccess/.htpasswd on the staging site, that wont work for keeping .htaccess in version control.
I’m leaning toward not using .htaccess for the security, and just using a WordPress plugin.
That one looks pretty good, and allows easy access. The one I posted, you kinda have to go through a few more hoops. You use to be able to add an IP, then they would get full access, but now that’s in the paid version.