Fix two git storage bugs and add tests

Merged username-removed-26331 requested to merge grote/repomaker:170-git-storage-error into master

Closes #170 (closed)