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 9F12B9230 for ; Tue, 7 Feb 2012 18:49:29 +0000 (UTC) Received: (qmail 56520 invoked by uid 500); 7 Feb 2012 18:49:29 -0000 Delivered-To: apmail-maven-issues-archive@maven.apache.org Received: (qmail 56457 invoked by uid 500); 7 Feb 2012 18:49:28 -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 56449 invoked by uid 99); 7 Feb 2012 18:49:28 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 Feb 2012 18:49:28 +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; Tue, 07 Feb 2012 18:49:23 +0000 Received: from codehaus01.managed.contegix.com (localhost.localdomain [127.0.0.1]) by codehaus01.managed.contegix.com (Postfix) with ESMTP id 257B8B0473 for ; Tue, 7 Feb 2012 12:49:03 -0600 (CST) Date: Tue, 7 Feb 2012 12:49:03 -0600 (CST) From: "Mark Struberg (JIRA)" To: issues@maven.apache.org Message-ID: <2099632098.33095.1328640543156.JavaMail.j2ee-jira@codehaus01.managed.contegix.com> In-Reply-To: <666066569.33006.1328633642892.JavaMail.j2ee-jira@codehaus01.managed.contegix.com> Subject: [jira] (SCM-663) scm:update with GIT sometimes fails to report the affected files MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-JIRA-FingerPrint: 22cf62d5d84cf5bea94eb3b65e0ebd09 [ https://jira.codehaus.org/browse/SCM-663?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Mark Struberg closed SCM-663. ----------------------------- Resolution: Fixed Fix Version/s: 1.7 > scm:update with GIT sometimes fails to report the affected files > ----------------------------------------------------------------- > > Key: SCM-663 > URL: https://jira.codehaus.org/browse/SCM-663 > Project: Maven SCM > Issue Type: Bug > Components: maven-scm-provider-git > Affects Versions: 1.6 > Environment: git 1.7.5.4, mvn-3.0.4, OSX, Linux, locale de_AT > Reporter: Mark Struberg > Assignee: Mark Struberg > Priority: Critical > Fix For: 1.7 > > > I'm not sure if this is a change which got introduced in git-1.7.5 or if it's only depending on a specific local setting. In any case git pull doesn't always report the affected files. Thus we cannot parse it this way. > When executing the ScmUpdateTck, I get the following output > {noformat} > ~$>cd /Users/struberg/develop/java/apache/maven/scm/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/target/scm-test/updating-copy && git pull file:///Users/struberg/develop/java/apache/maven/scm/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/target/scm-test/repository master > remote: Counting objects: 14, done. > remote: Compressing objects: 100% (4/4), done. > remote: Total 9 (delta 0), reused 0 (delta 0) > Unpacking objects: 100% (9/9), done. > From file:///Users/struberg/develop/java/apache/maven/scm/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/target/scm-test/repository > * branch master -> FETCH_HEAD > First, rewinding head to replay your work on top of it... > Fast-forwarded master to fa61c64a494a5c4b28bc6211104982e35a970e1b. > {noformat} > In my case this is mostly caused by having specified the branch.autosetuprebase on all my boxes. We would need to check if this is also the case for our CI server on builds.apache.org. -- 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