maven-issues mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Darryl L. Miles (JIRA)" <j...@codehaus.org>
Subject [jira] (MRELEASE-809) prepare-with-pom deletes release-pom.xml then tries to git add it (presumably so the next commit records the fact)
Date Thu, 06 Dec 2012 17:19:13 GMT

    [ https://jira.codehaus.org/browse/MRELEASE-809?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=315157#comment-315157
] 

Darryl L. Miles edited comment on MRELEASE-809 at 12/6/12 11:17 AM:
--------------------------------------------------------------------

Patch in git format against maven-scm.git master c96ca24

The code in the CheckIn operation the patch touches could be improved as it does two "git
status --porcelain" during the check-in operation.  Maybe these could merged into the 'git
status' I now perform.

This patch also make an API public this follows the same design as the Bazaar plugin uses.
                
      was (Author: dlmiles):
    Patch in git format against maven-scm.git master c96ca24

The code in the CheckIn operation the patch sources could be improved as it does two "git
status --porcelain" during the check-in operation.  Maybe these could merged into the 'git
status' I now perform.

This patch also make an API public this follows the same design as the Bazaar plugin uses.
                  
> prepare-with-pom deletes release-pom.xml then tries to git add it (presumably so the
next commit records the fact)
> ------------------------------------------------------------------------------------------------------------------
>
>                 Key: MRELEASE-809
>                 URL: https://jira.codehaus.org/browse/MRELEASE-809
>             Project: Maven 2.x Release Plugin
>          Issue Type: Bug
>          Components: Git
>    Affects Versions: 2.3.2
>            Reporter: Darryl L. Miles
>         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 is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators: https://jira.codehaus.org/secure/ContactAdministrators!default.jspa
For more information on JIRA, see: http://www.atlassian.com/software/jira

        

Mime
View raw message