Raymond, thank you for getting on top of my initial query. Although your current patch has bugs, I'm confident that you are able to fix it. I'm looking forward to see the option --intent-to-add works correctly. I appreciate the effort of you and code reviewers.