slight tweaks; git_branch() is needed before src/ is unlocked (on encFS)