[SCM-705] Git pushes tag ambigiously Submitted by Darryl L. Miles
Project: http://git-wip-us.apache.org/repos/asf/maven-scm/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-scm/commit/f7b115ed Tree: http://git-wip-us.apache.org/repos/asf/maven-scm/tree/f7b115ed Diff: http://git-wip-us.apache.org/repos/asf/maven-scm/diff/f7b115ed Branch: refs/heads/master Commit: f7b115ed0ca0f429b9fd644528211f66d008dbbf Parents: 95ed7a4 Author: olivier lamy <[email protected]> Authored: Thu Jan 24 17:40:26 2013 +0100 Committer: olivier lamy <[email protected]> Committed: Thu Jan 24 17:40:26 2013 +0100 ---------------------------------------------------------------------- .../gitexe/command/branch/GitBranchCommand.java | 2 +- .../gitexe/command/checkin/GitCheckInCommand.java | 2 +- .../git/gitexe/command/tag/GitTagCommand.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-scm/blob/f7b115ed/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 ---------------------------------------------------------------------- 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/branch/GitBranchCommand.java b/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 index 9cbb16e..13b4751 100644 --- a/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 +++ b/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 @@ -122,7 +122,7 @@ public class GitBranchCommand Commandline cl = GitCommandLineUtils.getBaseGitCommandLine( fileSet.getBasedir(), "push" ); cl.createArg().setValue( repository.getPushUrl() ); - cl.createArg().setValue( branch ); + cl.createArg().setValue( "refs/heads/" + branch ); return cl; } http://git-wip-us.apache.org/repos/asf/maven-scm/blob/f7b115ed/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 ---------------------------------------------------------------------- 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/checkin/GitCheckInCommand.java b/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 index 5babfa3..37628c9 100644 --- a/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 +++ b/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 @@ -199,7 +199,7 @@ public class GitCheckInCommand cl.createArg().setValue( repository.getPushUrl() ); - cl.createArg().setValue( branch + ":" + branch ); + cl.createArg().setValue( "refs/heads/" + branch + ":" + "refs/heads/" + branch ); return cl; } http://git-wip-us.apache.org/repos/asf/maven-scm/blob/f7b115ed/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 ---------------------------------------------------------------------- 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/tag/GitTagCommand.java b/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 index 38b3307..daf9576 100644 --- a/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 +++ b/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 @@ -163,7 +163,7 @@ public class GitTagCommand Commandline cl = GitCommandLineUtils.getBaseGitCommandLine( fileSet.getBasedir(), "push" ); cl.createArg().setValue( repository.getPushUrl() ); - cl.createArg().setValue( tag ); + cl.createArg().setValue( "refs/tags/" + tag ); return cl; }
