Updated Branches: refs/heads/master 6a819bc79 -> 42aa31170
trim content for renamed files Project: http://git-wip-us.apache.org/repos/asf/maven-scm/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-scm/commit/42aa3117 Tree: http://git-wip-us.apache.org/repos/asf/maven-scm/tree/42aa3117 Diff: http://git-wip-us.apache.org/repos/asf/maven-scm/diff/42aa3117 Branch: refs/heads/master Commit: 42aa311705fd7dfad97073bb0102045ad0a666e2 Parents: 6a819bc Author: olivier lamy <[email protected]> Authored: Sat Oct 13 21:46:49 2012 +0200 Committer: olivier lamy <[email protected]> Committed: Sat Oct 13 21:46:49 2012 +0200 ---------------------------------------------------------------------- .../maven-scm-provider-gitexe/pom.xml | 4 ++++ .../gitexe/command/status/GitStatusConsumer.java | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-scm/blob/42aa3117/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/pom.xml ---------------------------------------------------------------------- diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/pom.xml b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/pom.xml index 82e3a48..2cc9c09 100644 --- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/pom.xml +++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/pom.xml @@ -42,6 +42,10 @@ <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> <!-- Test --> <dependency> http://git-wip-us.apache.org/repos/asf/maven-scm/blob/42aa3117/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/status/GitStatusConsumer.java ---------------------------------------------------------------------- diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/status/GitStatusConsumer.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/status/GitStatusConsumer.java index 1dd9137..d9cc75a 100644 --- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/status/GitStatusConsumer.java +++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/status/GitStatusConsumer.java @@ -19,12 +19,12 @@ package org.apache.maven.scm.provider.git.gitexe.command.status; * under the License. */ +import org.apache.commons.lang.StringUtils; import org.apache.maven.scm.ScmFile; import org.apache.maven.scm.ScmFileStatus; import org.apache.maven.scm.log.ScmLogger; import org.apache.regexp.RE; import org.apache.regexp.RESyntaxException; -import org.codehaus.plexus.util.StringUtils; import org.codehaus.plexus.util.cli.StreamConsumer; import java.io.File; @@ -147,8 +147,8 @@ public class GitStatusConsumer else if ( renamedRegexp.match( line ) ) { status = ScmFileStatus.RENAMED; - files.add( renamedRegexp.getParen( 1 ) ); - files.add( renamedRegexp.getParen( 2 ) ); + files.add( StringUtils.trim( renamedRegexp.getParen( 1 ) ) ); + files.add( StringUtils.trim( renamedRegexp.getParen( 2 ) ) ); logger.debug( "RENAMED status for line '" + line + "' files added '" + renamedRegexp.getParen( 1 ) + "' '" + renamedRegexp.getParen( 2 ) ); }
