You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2012/02/07 03:10:52 UTC
svn commit: r1241328 - in
/maven/scm/trunk/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 checkout/GitCheckOutCommand.java
Author: hboutemy
Date: Tue Feb 7 02:10:51 2012
New Revision: 1241328
URL: http://svn.apache.org/viewvc?rev=1241328&view=rev
Log:
code formatting
Modified:
maven/scm/trunk/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
maven/scm/trunk/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
Modified: maven/scm/trunk/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
URL: http://svn.apache.org/viewvc/maven/scm/trunk/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?rev=1241328&r1=1241327&r2=1241328&view=diff
==============================================================================
--- maven/scm/trunk/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 (original)
+++ maven/scm/trunk/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 Tue Feb 7 02:10:51 2012
@@ -193,7 +193,7 @@ public class GitCheckInCommand
String branch = GitBranchCommand.getCurrentBranch( logger, repository, fileSet );
- if ( branch == null || branch.length() == 0)
+ if ( branch == null || branch.length() == 0 )
{
throw new ScmException( "Could not detect the current branch. Don't know where I should push to!" );
}
Modified: maven/scm/trunk/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
URL: http://svn.apache.org/viewvc/maven/scm/trunk/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?rev=1241328&r1=1241327&r2=1241328&view=diff
==============================================================================
--- maven/scm/trunk/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 (original)
+++ maven/scm/trunk/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 Tue Feb 7 02:10:51 2012
@@ -104,7 +104,7 @@ public class GitCheckOutCommand
&& result.getBranches().size() > 0 )
{
// git repo exists, so we must git-pull the changes
- Commandline clPull = createPullCommand(repository, fileSet.getBasedir(), version);
+ Commandline clPull = createPullCommand( repository, fileSet.getBasedir(), version );
exitCode = GitCommandLineUtils.execute( clPull, stdout, stderr, getLogger() );
if ( exitCode != 0 )
@@ -167,7 +167,8 @@ public class GitCheckOutCommand
{
Commandline cl = GitCommandLineUtils.getBaseGitCommandLine( workingDirectory.getParentFile(), "clone" );
- if ( version != null && (version instanceof ScmBranch) ) {
+ if ( version != null && ( version instanceof ScmBranch ) )
+ {
cl.createArg().setValue( "--branch" );