You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@maven.apache.org by "Mark Struberg (JIRA)" <ji...@codehaus.org> on 2012/02/07 17:54:02 UTC
[jira] (SCM-663) scm:update with GIT sometimes fails to report the
affected files
Mark Struberg created SCM-663:
---------------------------------
Summary: 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
Priority: Critical
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
[jira] (SCM-663) scm:update with GIT sometimes fails to report the
affected files
Posted by "Mark Struberg (JIRA)" <ji...@codehaus.org>.
[ 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
[jira] (SCM-663) scm:update with GIT sometimes fails to report the
affected files
Posted by "Mark Struberg (JIRA)" <ji...@codehaus.org>.
[ https://jira.codehaus.org/browse/SCM-663?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=291060#comment-291060 ]
Mark Struberg commented on SCM-663:
-----------------------------------
Solution for this problem.
I've changed the GitUpdateCommand to
1.) get the current sha1,
2.) perform the git pull
3.) run a git-diff --raw and parse the output for getting the changed files.
> 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
> Priority: Critical
>
> 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
[jira] (SCM-663) scm:update with GIT sometimes fails to report the
affected files
Posted by "Mark Struberg (JIRA)" <ji...@codehaus.org>.
[ https://jira.codehaus.org/browse/SCM-663?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=291069#comment-291069 ]
Mark Struberg commented on SCM-663:
-----------------------------------
fixed in r1241527.
> 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
>
> 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