Merge branch 'rr/test-make-sure-we-have-git' into maint

* rr/test-make-sure-we-have-git: t/test-lib: make sure Git has already been built