Clean up git scmtools tests a bit.

This fixes one thing where we're skipping an assertion, and fixes a file
descriptor leak.

Testing done:
Ran unit tests.
Merge branch 'release-2.0.x'