updated with Git2 changes