Move git2-rs back to upstream
Update for git2-rs changes