Author: struberg
Date: Sun Feb 13 15:35:40 2011
New Revision: 1070251

URL: http://svn.apache.org/viewvc?rev=1070251&view=rev
Log:
[SCM-566] fix comments and error output to now say 'origin' anymore

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/branch/GitBranchCommand.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/tag/GitTagCommand.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/update/GitUpdateCommand.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/branch/GitBranchCommand.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/branch/GitBranchCommand.java?rev=1070251&r1=1070250&r2=1070251&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/branch/GitBranchCommand.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/branch/GitBranchCommand.java
 Sun Feb 13 15:35:40 2011
@@ -76,7 +76,7 @@ public class GitBranchCommand
 
         if( repo.isPushChanges() ) 
         {
-            // and now push the branch to the origin repository
+            // and now push the branch to the upstream repository
             Commandline clPush = createPushCommandLine( repository, fileSet, 
branch );
 
             exitCode = GitCommandLineUtils.execute( clPush, stdout, stderr, 
getLogger() );

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/tag/GitTagCommand.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/tag/GitTagCommand.java?rev=1070251&r1=1070250&r2=1070251&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/tag/GitTagCommand.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/tag/GitTagCommand.java
 Sun Feb 13 15:35:40 2011
@@ -101,7 +101,7 @@ public class GitTagCommand
 
             if( repo.isPushChanges() ) 
             {
-                // and now push the tag to the origin repository
+                // and now push the tag to the configured upstream repository
                 Commandline clPush = createPushCommandLine( repository, 
fileSet, tag );
     
                 exitCode = GitCommandLineUtils.execute( clPush, stdout, 
stderr, getLogger() );

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/update/GitUpdateCommand.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/update/GitUpdateCommand.java?rev=1070251&r1=1070250&r2=1070251&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/update/GitUpdateCommand.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/update/GitUpdateCommand.java
 Sun Feb 13 15:35:40 2011
@@ -73,7 +73,7 @@ public class GitUpdateCommand
             {
                 getLogger().warn( "failed to update git, return code " + 
exitCode );
             }
-            return new UpdateScmResult( cl.toString(), "The git-pull origin 
master command failed.",
+            return new UpdateScmResult( cl.toString(), "The git-pull command 
failed.",
                                         stderr.getOutput(), false );
         }
         


Reply via email to