SVN to Git port with minor workarounds