[git] (GH-83) Clean up unresolvable ref errors
Merge branch 'maint/next/unresolvable-ref-errors' into next

This closes GH-83