Style nit:  while we use 'worktree' and 'workdir' interchangeably, there appear to be many more instances of 'workdir' (by grepping `include/git2`).  We should probably standardize on this?