All: Test failures against core git

[gabrielschulhof]

Upstream changes are causing our test runs against git core to fail. There are changes we can make to fix the tests which we should make regardless of whether core rolls back the changes or not.