fix commit issue
Project: http://git-wip-us.apache.org/repos/asf/maven-scm/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-scm/commit/1fe25457 Tree: http://git-wip-us.apache.org/repos/asf/maven-scm/tree/1fe25457 Diff: http://git-wip-us.apache.org/repos/asf/maven-scm/diff/1fe25457 Branch: refs/heads/master Commit: 1fe25457dae82bc725fdb5ba346eb48140321f4e Parents: 94f88f0 Author: imod <d...@fortysix.ch> Authored: Fri Jun 21 22:14:10 2013 +0200 Committer: imod <d...@fortysix.ch> Committed: Fri Jun 21 22:14:10 2013 +0200 ---------------------------------------------------------------------- .../scm/provider/git/jgit/command/JGitUtils.java | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-scm/blob/1fe25457/src/main/java/org/apache/maven/scm/provider/git/jgit/command/JGitUtils.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/maven/scm/provider/git/jgit/command/JGitUtils.java b/src/main/java/org/apache/maven/scm/provider/git/jgit/command/JGitUtils.java index e3f6c11..1072d1b 100644 --- a/src/main/java/org/apache/maven/scm/provider/git/jgit/command/JGitUtils.java +++ b/src/main/java/org/apache/maven/scm/provider/git/jgit/command/JGitUtils.java @@ -228,10 +228,7 @@ public class JGitUtils { AddCommand add = git.add(); for (File file : fileSet.getFileList()) { if (file.exists()) { - String path = file.getPath(); - if (file.isAbsolute()) { - path = baseUri.relativize(new File(path).toURI()).getPath(); - } + String path = relativize(baseUri, file); add.addFilepattern(path); } } @@ -249,8 +246,8 @@ public class JGitUtils { // if a specific fileSet is given, we have to check if the file is // really tracked for (Iterator<File> itfl = fileSet.getFileList().iterator(); itfl.hasNext();) { - File f = (File) itfl.next(); - if (f.toString().equals(scmfile.getPath())) { + String path = relativize(baseUri, itfl.next()); + if (path.equals(scmfile.getPath())) { changedFiles.add(scmfile); } } @@ -258,6 +255,14 @@ public class JGitUtils { return changedFiles; } + private static String relativize(URI baseUri, File f) { + String path = f.getPath(); + if (f.isAbsolute()) { + path = baseUri.relativize(new File(path).toURI()).getPath(); + } + return path; + } + /** * Get a list of commits between two revisions. *
