You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2018/08/12 22:48:16 UTC
[maven-scm] branch path-fiddle updated: Fixes for cygwin
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch path-fiddle
in repository https://gitbox.apache.org/repos/asf/maven-scm.git
The following commit(s) were added to refs/heads/path-fiddle by this push:
new 5f5193e Fixes for cygwin
5f5193e is described below
commit 5f5193edf93ce7ea6db944c9703e71fbae7fecbe
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Mon Aug 13 00:25:16 2018 +0200
Fixes for cygwin
---
.../scm/provider/git/gitexe/command/GitCommandLineUtils.java | 12 +++++++-----
.../git/gitexe/command/checkout/GitCheckOutCommand.java | 6 +++---
.../git/gitexe/command/GitCommandLineUtilsAddTargetTest.java | 4 ++--
.../provider/git/command/update/GitUpdateCommandTckTest.java | 2 +-
4 files changed, 13 insertions(+), 11 deletions(-)
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/GitCommandLineUtils.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/GitCommandLineUtils.java
index 4f23195..bb1dad1 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/GitCommandLineUtils.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/GitCommandLineUtils.java
@@ -19,6 +19,8 @@ package org.apache.maven.scm.provider.git.gitexe.command;
* under the License.
*/
+import org.apache.commons.io.FilenameUtils;
+
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.log.ScmLogger;
import org.apache.maven.scm.provider.git.util.GitUtil;
@@ -34,7 +36,7 @@ import java.util.List;
/**
* Command line construction utility.
- *
+ *
* @author Brett Porter
* @author <a href="mailto:struberg@yahoo.de">Mark Struberg</a>
*
@@ -73,7 +75,7 @@ public final class GitCommandLineUtils
}
// no setFile() since this screws up the working directory!
- cl.createArg().setValue( relativeFile );
+ cl.createArg().setValue( FilenameUtils.separatorsToUnix( relativeFile ) );
}
}
catch ( IOException ex )
@@ -84,7 +86,7 @@ public final class GitCommandLineUtils
}
/**
- *
+ *
* @param workingDirectory
* @param command
* @return
@@ -97,7 +99,7 @@ public final class GitCommandLineUtils
/**
* Creates a {@link Commandline} for which the toString() do not display
* password.
- *
+ *
* @param workingDirectory
* @param command
* @return CommandLine with anonymous output.
@@ -176,4 +178,4 @@ public final class GitCommandLineUtils
return exitCode;
}
-}
\ No newline at end of file
+}
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/checkout/GitCheckOutCommand.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/checkout/GitCheckOutCommand.java
index d2e8613..7fcda9c 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/checkout/GitCheckOutCommand.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/checkout/GitCheckOutCommand.java
@@ -194,7 +194,7 @@ public class GitCheckOutCommand
cl.createArg().setValue( repository.getFetchUrl() );
- cl.createArg().setFile( workingDirectory );
+ cl.createArg().setValue( workingDirectory.getName() );
return cl;
}
@@ -223,8 +223,8 @@ public class GitCheckOutCommand
// A tag will not be pulled but we only fetch all the commits from the upstream repo
// This is done because checking out a tag might not happen on the current branch
// but create a 'detached HEAD'.
- // In fact, a tag in git may be in multiple branches. This occurs if
- // you create a branch after the tag has been created
+ // In fact, a tag in git may be in multiple branches. This occurs if
+ // you create a branch after the tag has been created
cl = GitCommandLineUtils.getBaseGitCommandLine( workingDirectory, "fetch" );
cl.createArg().setValue( repository.getFetchUrl() );
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/GitCommandLineUtilsAddTargetTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/GitCommandLineUtilsAddTargetTest.java
index 6574922..5005cee 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/GitCommandLineUtilsAddTargetTest.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/GitCommandLineUtilsAddTargetTest.java
@@ -65,7 +65,7 @@ public class GitCommandLineUtilsAddTargetTest
// https://jira.codehaus.org/browse/SCM-667
final List<File> filesToAdd = Arrays.asList( new File( "C:\\prj\\pom.xml" ),
new File( "c:\\prj\\mod1\\pom.xml" ) );
- final String expectedArguments = "[add, pom.xml, mod1\\pom.xml]";
+ final String expectedArguments = "[add, pom.xml, mod1/pom.xml]";
check( workingDir, filesToAdd, expectedArguments );
}
@@ -108,4 +108,4 @@ public class GitCommandLineUtilsAddTargetTest
{
return Os.isFamily( Os.FAMILY_WINDOWS );
}
-}
\ No newline at end of file
+}
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/update/GitUpdateCommandTckTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/update/GitUpdateCommandTckTest.java
index ff277b5..d60ff61 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/update/GitUpdateCommandTckTest.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/update/GitUpdateCommandTckTest.java
@@ -37,7 +37,7 @@ public abstract class GitUpdateCommandTckTest
public void initRepo()
throws Exception
{
- GitScmTestUtils.initRepo( "src/test/resources/repository/", getRepositoryRoot(), getWorkingDirectory() );
+ GitScmTestUtils.initRepo( "src/test/resources/repository/", getRepositoryRoot(), getUpdatingCopy() );
}
@Override