Corrected git commands that parse the porcelain status to correctly compare paths using the linux path separator.
Project: http://git-wip-us.apache.org/repos/asf/maven-scm/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-scm/commit/57a1f0a8 Tree: http://git-wip-us.apache.org/repos/asf/maven-scm/tree/57a1f0a8 Diff: http://git-wip-us.apache.org/repos/asf/maven-scm/diff/57a1f0a8 Branch: refs/heads/master Commit: 57a1f0a8f45c0ae403d10c3a87d1cd626d2c7f33 Parents: ff6703b Author: Mark Hobson <ma...@apache.org> Authored: Wed Oct 24 21:02:42 2012 +0100 Committer: Mark Hobson <ma...@apache.org> Committed: Wed Oct 24 21:02:42 2012 +0100 ---------------------------------------------------------------------- .../git/gitexe/command/add/GitAddCommand.java | 3 ++- .../gitexe/command/checkin/GitCheckInCommand.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-scm/blob/57a1f0a8/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/add/GitAddCommand.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/add/GitAddCommand.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/add/GitAddCommand.java index 8c44e02..2600dcd 100644 --- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/add/GitAddCommand.java +++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/add/GitAddCommand.java @@ -20,6 +20,7 @@ package org.apache.maven.scm.provider.git.gitexe.command.add; */ import org.apache.commons.io.FileUtils; +import org.apache.commons.io.FilenameUtils; import org.apache.maven.scm.ScmException; import org.apache.maven.scm.ScmFile; import org.apache.maven.scm.ScmFileSet; @@ -98,7 +99,7 @@ public class GitAddCommand // if a specific fileSet is given, we have to check if the file is really tracked for ( File f : fileSet.getFileList() ) { - if ( f.toString().equals( scmfile.getPath() ) ) + if ( FilenameUtils.separatorsToUnix( f.getPath() ).equals( scmfile.getPath() ) ) { changedFiles.add( scmfile ); } http://git-wip-us.apache.org/repos/asf/maven-scm/blob/57a1f0a8/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommand.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/checkin/GitCheckInCommand.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommand.java index 3c4a6f2..5babfa3 100644 --- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommand.java +++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommand.java @@ -19,6 +19,7 @@ package org.apache.maven.scm.provider.git.gitexe.command.checkin; * under the License. */ +import org.apache.commons.io.FilenameUtils; import org.apache.maven.scm.ScmException; import org.apache.maven.scm.ScmFile; import org.apache.maven.scm.ScmFileSet; @@ -154,7 +155,7 @@ public class GitCheckInCommand // if a specific fileSet is given, we have to check if the file is really tracked for ( File f : fileSet.getFileList() ) { - if ( f.toString().equals( scmfile.getPath() ) ) + if ( FilenameUtils.separatorsToUnix( f.getPath() ).equals( scmfile.getPath() ) ) { checkedInFiles.add( scmfile ); }
