[
https://jira.codehaus.org/browse/SCM-706?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=352134#comment-352134
]
Arthur Housinger edited comment on SCM-706 at 9/1/14 8:19 PM:
--------------------------------------------------------------
It appears that this is still reproducing in 2.5, and the patch doesn't seem to
apply to the code for 2.5. Is there any ETA for either the patch being updated
(assuming I'm correct in that it needs updating) or this ticket being resolved?
Or does it make more sense for people to move away from prepare-with-pom if
they are on git?
was (Author: mistermouse):
It appears that this is still reproducing in 2.5, and the patch doesn't seem to
apply to the code for 2.5. Is there any ETA for either the patch being updated
(assuming I'm correct in that it needs updating) or this ticket being resolved?
> prepare-with-pom deletes release-pom.xml then tries to git add it (presumably
> so the next commit records the fact)
> ------------------------------------------------------------------------------------------------------------------
>
> Key: SCM-706
> URL: https://jira.codehaus.org/browse/SCM-706
> Project: Maven SCM
> Issue Type: Bug
> Components: maven-scm-provider-git
> Affects Versions: 1.8.1
> Reporter: Darryl L. Miles
> Assignee: Mark Struberg
> Attachments:
> 0001-MRELEASE-809-Use-git-correctly-when-removing-and-add.patch
>
>
> 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.
--
This message was sent by Atlassian JIRA
(v6.1.6#6162)
