Merge "repo_diff: workspace mustn't be in existing tree"