Details
-
Type:
Bug
-
Status:
Closed
-
Priority:
Critical
-
Resolution: Fixed
-
Affects Version/s: 1.6
-
Fix Version/s: 1.7
-
Component/s: maven-scm-provider-git
-
Labels:None
-
Environment:git 1.7.5.4, mvn-3.0.4, OSX, Linux, locale de_AT
-
Complexity:Intermediate
-
Number of attachments :
Description
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
~$>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.
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.
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.