From issues-return-82442-apmail-maven-issues-archive=maven.apache.org@maven.apache.org Thu Dec 6 17:19:45 2012 Return-Path: X-Original-To: apmail-maven-issues-archive@minotaur.apache.org Delivered-To: apmail-maven-issues-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 00A74E2E9 for ; Thu, 6 Dec 2012 17:19:44 +0000 (UTC) Received: (qmail 18132 invoked by uid 500); 6 Dec 2012 17:19:44 -0000 Delivered-To: apmail-maven-issues-archive@maven.apache.org Received: (qmail 17930 invoked by uid 500); 6 Dec 2012 17:19:43 -0000 Mailing-List: contact issues-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@maven.apache.org Delivered-To: mailing list issues@maven.apache.org Received: (qmail 17901 invoked by uid 99); 6 Dec 2012 17:19:42 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Dec 2012 17:19:42 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=5.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: local policy) Received: from [63.246.24.159] (HELO codehaus01.managed.contegix.com) (63.246.24.159) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Dec 2012 17:19:33 +0000 Received: from codehaus01 (localhost.localdomain [127.0.0.1]) by codehaus01.managed.contegix.com (Postfix) with ESMTP id 44591B045B for ; Thu, 6 Dec 2012 11:19:13 -0600 (CST) Date: Thu, 6 Dec 2012 11:19:13 -0600 (CST) From: "Darryl L. Miles (JIRA)" To: issues@maven.apache.org Message-ID: <1038311492.19515.1354814353280.JavaMail.j2ee-jira@codehaus01.managed.contegix.com> In-Reply-To: <1940133570.18541.1354662733787.JavaMail.j2ee-jira@codehaus01.managed.contegix.com> 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) MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-JIRA-FingerPrint: 22cf62d5d84cf5bea94eb3b65e0ebd09 X-Virus-Checked: Checked by ClamAV on apache.org [ 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