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/03/18 01:01:27 UTC
maven-scm git commit: [SCM-875] GitUpdateCommand assumes master branch
Repository: maven-scm
Updated Branches:
refs/heads/SCM-875 [created] 89e8661c6
[SCM-875] GitUpdateCommand assumes master branch
Project: http://git-wip-us.apache.org/repos/asf/maven-scm/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-scm/commit/89e8661c
Tree: http://git-wip-us.apache.org/repos/asf/maven-scm/tree/89e8661c
Diff: http://git-wip-us.apache.org/repos/asf/maven-scm/diff/89e8661c
Branch: refs/heads/SCM-875
Commit: 89e8661c654603b514edea83535dda3a915854ab
Parents: 302ccb4
Author: Michael Osipov <mi...@apache.org>
Authored: Sun Mar 18 02:00:50 2018 +0100
Committer: Michael Osipov <mi...@apache.org>
Committed: Sun Mar 18 02:00:50 2018 +0100
----------------------------------------------------------------------
.../gitexe/command/update/GitUpdateCommand.java | 35 ++++++++------------
.../command/update/GitUpdateCommandTest.java | 4 +--
2 files changed, 15 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/89e8661c/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/update/GitUpdateCommand.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/update/GitUpdateCommand.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/update/GitUpdateCommand.java
index 42fa587..1519653 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/update/GitUpdateCommand.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/update/GitUpdateCommand.java
@@ -96,7 +96,7 @@ public class GitUpdateCommand
stderr.getOutput(), false );
}
-
+
// now let's get the latest version
consumerRev = new GitLatestRevisionCommandConsumer( getLogger() );
exitCode = GitCommandLineUtils.execute( clRev, consumerRev, stderr, getLogger() );
@@ -106,7 +106,7 @@ public class GitUpdateCommand
stderr.getOutput(), false );
}
String latestRevision = consumerRev.getLatestRevision();
-
+
return new UpdateScmResultWithRevision( cl.toString(), diffRawConsumer.getChangedFiles(), latestRevision );
}
@@ -115,18 +115,18 @@ public class GitUpdateCommand
{
GitChangeLogCommand changelogCmd = new GitChangeLogCommand();
changelogCmd.setLogger( getLogger() );
-
+
return changelogCmd;
}
-
+
/**
- * create the command line for updating the current branch with the info from the foreign repository.
+ * create the command line for updating the current branch with the info from the foreign repository.
*/
public static Commandline createCommandLine( GitScmProviderRepository repository, File workingDirectory,
ScmVersion scmVersion )
{
Commandline cl = GitCommandLineUtils.getBaseGitCommandLine( workingDirectory, "pull" );
-
+
cl.createArg().setLine( repository.getFetchUrl() );
// now set the branch where we would like to pull from
@@ -134,14 +134,10 @@ public class GitUpdateCommand
{
cl.createArg().setLine( scmVersion.getName() );
}
- else
- {
- cl.createArg().setLine( "master" );
- }
-
+
return cl;
}
-
+
/**
* @param scmVersion a valid branch or <code>null</code> if the master branch should be taken
* @return CommandLine for getting the latest commit on the given branch
@@ -150,25 +146,20 @@ public class GitUpdateCommand
File workingDirectory, ScmVersion scmVersion )
{
Commandline cl = GitCommandLineUtils.getBaseGitCommandLine( workingDirectory, "log" );
-
+
// only show exactly 1 commit
- cl.createArg().setValue( "-n1" );
-
+ cl.createArg().setValue( "-n1" );
+
// same as --topo-order, but ensure ordering of merges
cl.createArg().setValue( "--date-order" );
-
+
if ( scmVersion != null && scmVersion instanceof ScmBranch && scmVersion.getName() != null
&& scmVersion.getName().length() > 0 )
{
// if any branch is given, lets take em
cl.createArg().setValue( scmVersion.getName() );
}
- else
- {
- // otherwise we work on the master branch
- cl.createArg().setValue( "master" );
- }
-
+
return cl;
}
}
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/89e8661c/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/update/GitUpdateCommandTest.java
----------------------------------------------------------------------
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/update/GitUpdateCommandTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/update/GitUpdateCommandTest.java
index c7de180..0e2f94f 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/update/GitUpdateCommandTest.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/update/GitUpdateCommandTest.java
@@ -38,7 +38,7 @@ public class GitUpdateCommandTest
public void testCommandLineNoBranch()
throws Exception
{
- testCommandLine( "scm:git:http://foo.com/git", null, "git pull http://foo.com/git master" );
+ testCommandLine( "scm:git:http://foo.com/git", null, "git pull http://foo.com/git" );
}
public void testCommandLineWithBranch()
@@ -51,7 +51,7 @@ public class GitUpdateCommandTest
public void testCommandLineLatestRevision()
throws Exception
{
- testLatestRevisionCommandLine( "scm:git:http://foo.com/git", null, "git log -n1 --date-order master" );
+ testLatestRevisionCommandLine( "scm:git:http://foo.com/git", null, "git log -n1 --date-order" );
}
// ----------------------------------------------------------------------