You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by im...@apache.org on 2013/11/24 14:12:05 UTC
[6/8] git commit: fix filename comparison on windows
fix filename comparison on windows
Project: http://git-wip-us.apache.org/repos/asf/maven-scm/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-scm/commit/95c00f2f
Tree: http://git-wip-us.apache.org/repos/asf/maven-scm/tree/95c00f2f
Diff: http://git-wip-us.apache.org/repos/asf/maven-scm/diff/95c00f2f
Branch: refs/heads/master
Commit: 95c00f2f5f57e8151f62b6f10b026f3d55b00359
Parents: 8f45a26
Author: imod <do...@fortysix.ch>
Authored: Sun Nov 24 12:21:08 2013 +0100
Committer: imod <do...@fortysix.ch>
Committed: Sun Nov 24 12:21:08 2013 +0100
----------------------------------------------------------------------
.../apache/maven/scm/provider/git/jgit/command/JGitUtils.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/95c00f2f/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/JGitUtils.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/JGitUtils.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/JGitUtils.java
index 686b92a..14fcf19 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/JGitUtils.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/JGitUtils.java
@@ -6,6 +6,7 @@ import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.ScmFileStatus;
import org.apache.maven.scm.log.ScmLogger;
import org.apache.maven.scm.provider.git.repository.GitScmProviderRepository;
+import org.apache.maven.scm.util.FilenameUtils;
import org.codehaus.plexus.util.StringUtils;
import org.eclipse.jgit.api.AddCommand;
import org.eclipse.jgit.api.Git;
@@ -279,7 +280,7 @@ public class JGitUtils
}
}
add.call();
-
+
Status status = git.status().call();
Set<String> allInIndex = new HashSet<String>();
@@ -300,7 +301,7 @@ public class JGitUtils
for ( Iterator<File> itfl = fileSet.getFileList().iterator(); itfl.hasNext(); )
{
String path = relativize( baseUri, itfl.next() );
- if ( path.equals( scmfile.getPath() ) )
+ if ( FilenameUtils.normalizeFilename( path ).equals( FilenameUtils.normalizeFilename( scmfile.getPath() ) ) )
{
addedFiles.add( scmfile );
}