[SCM-706] prepare-with-pom deletes release-pom.xml then tries to git add it (presumably so the next commit records the fact)

**[Darryl L. Miles](https://issues.apache.org/jira/secure/ViewProfile.jspa?name=dlmiles)** opened **[SCM-706](https://issues.apache.org/jira/browse/SCM-706?redirect=false)** and commented

When running: git release:prepare-with-pom

After the tag is created and pushed, it then runs the sequence:

git rm release-pom.xml
git add -- pom.xml release-pom.xml

But the "git add" fails because the "git rm" did the action of removing the actual file and adding the file removal fact to the cached index ready for the next commit to pickup.

The solution is to remove the "release-pom.xml" argument from the "git add" it is unnecessary.

---

**Affects:** 1.8.1

**Attachments:**
- [0001-MRELEASE-809-Use-git-correctly-when-removing-and-add.patch](https://issues.apache.org/jira/secure/attachment/12718909/0001-MRELEASE-809-Use-git-correctly-when-removing-and-add.patch) (_10.35 kB_)
- [pom.xml](https://issues.apache.org/jira/secure/attachment/12718524/pom.xml) (_784 bytes_)

**Remote Links:**
- [GitHub Pull Request #31
](https://github.com/apache/maven-scm/pull/31)
- [GitHub Pull Request #31
](https://github.com/apache/maven-scm/pull/31)

5 votes, 12 watchers

Start by reproducing `git release:prepare-with-pom` and inspect the sequence that removes `release-pom.xml` and stages `pom.xml`. The work is done when the command completes without trying to add the removed file and the removal is recorded for the next commit; review the linked pull request and attached patch for existing work.

Written by the indexing model from the issue text.