switch to bash instead of sh
re-add and fix git error message test
Merge branch 'git' into develop