Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/checkout/GitCheckOutCommandTckTest.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/checkout/GitCheckOutCommandTckTest.java?rev=823147&r1=823146&r2=823147&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/checkout/GitCheckOutCommandTckTest.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/checkout/GitCheckOutCommandTckTest.java Thu Oct 8 12:39:23 2009 @@ -19,6 +19,7 @@ * under the License. */ + import org.apache.maven.scm.provider.git.GitScmTestUtils; import org.apache.maven.scm.tck.command.checkout.CheckOutCommandTckTest; @@ -33,7 +34,7 @@ public String getScmUrl() throws Exception { - return GitScmTestUtils.getScmUrl( getRepositoryRoot() ); + return GitScmTestUtils.getScmUrl( getRepositoryRoot(), "git" ); } /** {...@inheritdoc} */ @@ -42,4 +43,5 @@ { GitScmTestUtils.initRepo( "src/test/resources/repository/", getRepositoryRoot(), getWorkingDirectory() ); } + }
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/diff/GitDiffCommandTckTest.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/diff/GitDiffCommandTckTest.java?rev=823147&r1=823146&r2=823147&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/diff/GitDiffCommandTckTest.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/diff/GitDiffCommandTckTest.java Thu Oct 8 12:39:23 2009 @@ -26,17 +26,10 @@ * @author <a href="mailto:strub...@yahoo.de";>Mark Struberg</a> * @version $Id$ */ -public class GitDiffCommandTckTest +public abstract class GitDiffCommandTckTest extends DiffCommandTckTest { /** {...@inheritdoc} */ - public String getScmUrl() - throws Exception - { - return GitScmTestUtils.getScmUrl( getRepositoryRoot() ); - } - - /** {...@inheritdoc} */ public void initRepo() throws Exception { Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/list/GitListCommandTckTest.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/list/GitListCommandTckTest.java?rev=823147&r1=823146&r2=823147&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/list/GitListCommandTckTest.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/list/GitListCommandTckTest.java Thu Oct 8 12:39:23 2009 @@ -26,17 +26,10 @@ * @author <a href="mailto:strub...@yahoo.de";>Mark Struberg</a> * @version $Id$ */ -public class GitListCommandTckTest +public abstract class GitListCommandTckTest extends ListCommandTckTest { /** {...@inheritdoc} */ - public String getScmUrl() - throws Exception - { - return GitScmTestUtils.getScmUrl( getRepositoryRoot() ); - } - - /** {...@inheritdoc} */ public void initRepo() throws Exception { Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/status/GitStatusCommandTckTest.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/status/GitStatusCommandTckTest.java?rev=823147&r1=823146&r2=823147&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/status/GitStatusCommandTckTest.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/status/GitStatusCommandTckTest.java Thu Oct 8 12:39:23 2009 @@ -26,17 +26,10 @@ * @author <a href="mailto:strub...@yahoo.de";>Mark Struberg</a> * @version $Id$ */ -public class GitStatusCommandTckTest +public abstract class GitStatusCommandTckTest extends StatusCommandTckTest { /** {...@inheritdoc} */ - public String getScmUrl() - throws Exception - { - return GitScmTestUtils.getScmUrl( getRepositoryRoot() ); - } - - /** {...@inheritdoc} */ public void initRepo() throws Exception { Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/tag/GitTagCommandTckTest.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/tag/GitTagCommandTckTest.java?rev=823147&r1=823146&r2=823147&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/tag/GitTagCommandTckTest.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/tag/GitTagCommandTckTest.java Thu Oct 8 12:39:23 2009 @@ -26,17 +26,10 @@ * @author <a href="mailto:strub...@yahoo.de";>Mark Struberg</a> * @version $Id$ */ -public class GitTagCommandTckTest +public abstract class GitTagCommandTckTest extends TagCommandTckTest { /** {...@inheritdoc} */ - public String getScmUrl() - throws Exception - { - return GitScmTestUtils.getScmUrl( getRepositoryRoot() ); - } - - /** {...@inheritdoc} */ public void initRepo() throws Exception { Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/update/GitUpdateCommandTckTest.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/update/GitUpdateCommandTckTest.java?rev=823147&r1=823146&r2=823147&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/update/GitUpdateCommandTckTest.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/update/GitUpdateCommandTckTest.java Thu Oct 8 12:39:23 2009 @@ -26,17 +26,10 @@ * @author <a href="mailto:strub...@yahoo.de";>Mark Struberg</a> * @version $Id$ */ -public class GitUpdateCommandTckTest +public abstract class GitUpdateCommandTckTest extends UpdateCommandTckTest { /** {...@inheritdoc} */ - public String getScmUrl() - throws Exception - { - return GitScmTestUtils.getScmUrl( getRepositoryRoot() ); - } - - /** {...@inheritdoc} */ public void initRepo() throws Exception { Modified: maven/scm/trunk/src/site/apt/git.apt URL: http://svn.apache.org/viewvc/maven/scm/trunk/src/site/apt/git.apt?rev=823147&r1=823146&r2=823147&view=diff ============================================================================== --- maven/scm/trunk/src/site/apt/git.apt (original) +++ maven/scm/trunk/src/site/apt/git.apt Thu Oct 8 12:39:23 2009 @@ -36,7 +36,7 @@ * SCM Url - For all URLs below, we use a colon (:) as separator. If you use a colon for one of the variables (e.g. a windows path), then use a pipe (|) as separator. + For all URLs below, we use a colon (:) as separator. If you use a colon for one of the variables (e.g. a windows path), then use a pipe (|) as separator. The separator for the port has to be a colon in any case since this part is specified in the git URL specification. See man git-fetch. ------- scm:git:git://server_name[:port]/path_to_repository @@ -46,7 +46,7 @@ scm:git:file://[hostname]/path_to_repository ------- -* Examples + * Examples ------- scm:git:git://github.com/path_to_repository @@ -56,6 +56,27 @@ scm:git:file://localhost/path_to_repository ------- +* Different Fetch and Push URLs + + In some cases a different URL has to be used for read and write operations. This can happen if e.g. fetch is performed via the http protocol, but writing to the repository is only possible via ssh. In this case both URLs may be written into the <developerConnection> tag. The fetch URL has to be prefixed with <<<[fetch=]>>> and the push URL with <<<[push=]>>> + + * Example: + +------- +<developerConnection>scm:git:[fetch=]http://mywebserver.org/path_to_repository[push=]ssh://usern...@otherserver:8898/~/repopath.git</developerConnection> +------- + +* Working with branches + + Since version 1.3, we assume that the name of the branch in the upstream repo is the same as the name of the current local branch. So whenever you invoke a maven-scm action which has to access the upstream repository, e.g. start a release, you should be on that very branch. + + In other words: If no branch is specified manually, every git-fetch, git-pull, git-push, etc will always work on the branch in the upstream repository which has the same branch name as your current local branch + +------- +git push pushUrl currentBranch:currentBranch +------- + + * Provider Configuration The provider configuration is defined in ${user.home}/.scm/git-settings.xml.
