now works with recent versions of git