You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@maven.apache.org by "Olivier Lamy (JIRA)" <ji...@codehaus.org> on 2010/03/11 23:33:57 UTC
[jira] Created: (SCM-536) CLONE -Git provider does 'git push'
during 'mvn release:prepare' which causes unwanted problems
CLONE -Git provider does 'git push' during 'mvn release:prepare' which causes unwanted problems
-----------------------------------------------------------------------------------------------
Key: SCM-536
URL: http://jira.codehaus.org/browse/SCM-536
Project: Maven SCM
Issue Type: Bug
Components: maven-scm-provider-git
Affects Versions: 1.1
Reporter: Olivier Lamy
Assignee: Olivier Lamy
Priority: Minor
Fix For: 1.4
When doing 'mvn release:prepare' with a Git provider, a 'git push' command is executed. This is not ideal because the push command can fail or push things from the local repository that are not needed/wanted in the remote repository. Some examples are:
1. The local repository has two branches: master (tracking origin/master) and dummy (tracking origin/dummy). The release is being made on the master branch, and the dummy and origin/dummy branches have diverged. Running 'release:prepare' causes a 'git push', which will succeed for the master branch (assuming that the release preparation has been made correctly) and fail for the dummy branch (the two branches have diverged and need to be merged or rebased). The release preparation aborts and the directory is left in a somewhat inconsistent state where manual cleaning up is needed (removing pom.xml.next files, changing versions to <new>-SNAPSHOT, etc.)
2. The local repository has two branches: master (tracking origin/master) and localtest (not in the origin repository). The localtest branch shouldn't be published because it is just used for some temporary testing and doesn't even work. It will be pushed during 'release:prepare'.
Suggested behaviour: use 'git push origin <currentbranch>:<currentbranch>', or even better, query for which remote repository to push to (found in .git/config) and which branch to push from and to. For me, it would be great to have a 'confirm push' before doing it so as to keep things clean, but maybe that is quite complex.
--
This message is automatically generated by JIRA.
-
If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa
-
For more information on JIRA, see: http://www.atlassian.com/software/jira
[jira] Updated: (MRELEASE-530) Git provider does 'git push' during
'mvn release:prepare' which causes unwanted problems (scm 1.4 upgrade)
Posted by "Olivier Lamy (JIRA)" <ji...@codehaus.org>.
[ http://jira.codehaus.org/browse/MRELEASE-530?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]
Olivier Lamy updated MRELEASE-530:
----------------------------------
Summary: Git provider does 'git push' during 'mvn release:prepare' which causes unwanted problems (scm 1.4 upgrade) (was: CLONE -Git provider does 'git push' during 'mvn release:prepare' which causes unwanted problems)
> Git provider does 'git push' during 'mvn release:prepare' which causes unwanted problems (scm 1.4 upgrade)
> ----------------------------------------------------------------------------------------------------------
>
> Key: MRELEASE-530
> URL: http://jira.codehaus.org/browse/MRELEASE-530
> Project: Maven 2.x Release Plugin
> Issue Type: Improvement
> Components: scm
> Reporter: Olivier Lamy
> Assignee: Olivier Lamy
> Priority: Minor
> Fix For: 2.0.1
>
>
> When doing 'mvn release:prepare' with a Git provider, a 'git push' command is executed. This is not ideal because the push command can fail or push things from the local repository that are not needed/wanted in the remote repository. Some examples are:
> 1. The local repository has two branches: master (tracking origin/master) and dummy (tracking origin/dummy). The release is being made on the master branch, and the dummy and origin/dummy branches have diverged. Running 'release:prepare' causes a 'git push', which will succeed for the master branch (assuming that the release preparation has been made correctly) and fail for the dummy branch (the two branches have diverged and need to be merged or rebased). The release preparation aborts and the directory is left in a somewhat inconsistent state where manual cleaning up is needed (removing pom.xml.next files, changing versions to <new>-SNAPSHOT, etc.)
> 2. The local repository has two branches: master (tracking origin/master) and localtest (not in the origin repository). The localtest branch shouldn't be published because it is just used for some temporary testing and doesn't even work. It will be pushed during 'release:prepare'.
> Suggested behaviour: use 'git push origin <currentbranch>:<currentbranch>', or even better, query for which remote repository to push to (found in .git/config) and which branch to push from and to. For me, it would be great to have a 'confirm push' before doing it so as to keep things clean, but maybe that is quite complex.
--
This message is automatically generated by JIRA.
-
If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa
-
For more information on JIRA, see: http://www.atlassian.com/software/jira
[jira] Commented: (MRELEASE-530) Git provider does 'git push'
during 'mvn release:prepare' which causes unwanted problems (scm 1.4
upgrade)
Posted by "Olivier Lamy (JIRA)" <ji...@codehaus.org>.
[ http://jira.codehaus.org/browse/MRELEASE-530?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=230364#action_230364 ]
Olivier Lamy commented on MRELEASE-530:
---------------------------------------
Ok I reproduce. I will investigate.
> Git provider does 'git push' during 'mvn release:prepare' which causes unwanted problems (scm 1.4 upgrade)
> ----------------------------------------------------------------------------------------------------------
>
> Key: MRELEASE-530
> URL: http://jira.codehaus.org/browse/MRELEASE-530
> Project: Maven 2.x Release Plugin
> Issue Type: Improvement
> Components: scm
> Reporter: Olivier Lamy
> Assignee: Olivier Lamy
> Priority: Minor
> Fix For: 2.1
>
>
> When doing 'mvn release:prepare' with a Git provider, a 'git push' command is executed. This is not ideal because the push command can fail or push things from the local repository that are not needed/wanted in the remote repository. Some examples are:
> 1. The local repository has two branches: master (tracking origin/master) and dummy (tracking origin/dummy). The release is being made on the master branch, and the dummy and origin/dummy branches have diverged. Running 'release:prepare' causes a 'git push', which will succeed for the master branch (assuming that the release preparation has been made correctly) and fail for the dummy branch (the two branches have diverged and need to be merged or rebased). The release preparation aborts and the directory is left in a somewhat inconsistent state where manual cleaning up is needed (removing pom.xml.next files, changing versions to <new>-SNAPSHOT, etc.)
> 2. The local repository has two branches: master (tracking origin/master) and localtest (not in the origin repository). The localtest branch shouldn't be published because it is just used for some temporary testing and doesn't even work. It will be pushed during 'release:prepare'.
> Suggested behaviour: use 'git push origin <currentbranch>:<currentbranch>', or even better, query for which remote repository to push to (found in .git/config) and which branch to push from and to. For me, it would be great to have a 'confirm push' before doing it so as to keep things clean, but maybe that is quite complex.
--
This message is automatically generated by JIRA.
-
If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa
-
For more information on JIRA, see: http://www.atlassian.com/software/jira
[jira] Closed: (MRELEASE-530) Git provider does 'git push' during
'mvn release:prepare' which causes unwanted problems (scm 1.4 upgrade)
Posted by "Olivier Lamy (JIRA)" <ji...@codehaus.org>.
[ http://jira.codehaus.org/browse/MRELEASE-530?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]
Olivier Lamy closed MRELEASE-530.
---------------------------------
Resolution: Fixed
fixed in [rev 922071|http://svn.apache.org/viewvc?rev=922071&view=rev]
> Git provider does 'git push' during 'mvn release:prepare' which causes unwanted problems (scm 1.4 upgrade)
> ----------------------------------------------------------------------------------------------------------
>
> Key: MRELEASE-530
> URL: http://jira.codehaus.org/browse/MRELEASE-530
> Project: Maven 2.x Release Plugin
> Issue Type: Improvement
> Components: scm
> Reporter: Olivier Lamy
> Assignee: Olivier Lamy
> Priority: Minor
> Fix For: 2.1
>
>
> When doing 'mvn release:prepare' with a Git provider, a 'git push' command is executed. This is not ideal because the push command can fail or push things from the local repository that are not needed/wanted in the remote repository. Some examples are:
> 1. The local repository has two branches: master (tracking origin/master) and dummy (tracking origin/dummy). The release is being made on the master branch, and the dummy and origin/dummy branches have diverged. Running 'release:prepare' causes a 'git push', which will succeed for the master branch (assuming that the release preparation has been made correctly) and fail for the dummy branch (the two branches have diverged and need to be merged or rebased). The release preparation aborts and the directory is left in a somewhat inconsistent state where manual cleaning up is needed (removing pom.xml.next files, changing versions to <new>-SNAPSHOT, etc.)
> 2. The local repository has two branches: master (tracking origin/master) and localtest (not in the origin repository). The localtest branch shouldn't be published because it is just used for some temporary testing and doesn't even work. It will be pushed during 'release:prepare'.
> Suggested behaviour: use 'git push origin <currentbranch>:<currentbranch>', or even better, query for which remote repository to push to (found in .git/config) and which branch to push from and to. For me, it would be great to have a 'confirm push' before doing it so as to keep things clean, but maybe that is quite complex.
--
This message is automatically generated by JIRA.
-
If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa
-
For more information on JIRA, see: http://www.atlassian.com/software/jira
[jira] Commented: (MRELEASE-530) Git provider does 'git push'
during 'mvn release:prepare' which causes unwanted problems (scm 1.4
upgrade)
Posted by "Brett Porter (JIRA)" <ji...@codehaus.org>.
[ http://jira.codehaus.org/browse/MRELEASE-530?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=230266#action_230266 ]
Brett Porter commented on MRELEASE-530:
---------------------------------------
with the latest SCM snapshots and this commit, I get 101 test failures in maven-release-manager on Mac. Another user reported the same thing yesterday.
{code}
Caused by: org.codehaus.plexus.component.repository.exception.ComponentRepositoryException: Component descriptor role: 'org.apache.maven.scm.manager.ScmManager', implementation: 'org.apache.maven.scm.manager.plexus.DefaultScmManager', role hint: 'default' has a hint, but there are other implementations that don't
{code}
I need to do more investigation, but do you have any ideas what this might be?
> Git provider does 'git push' during 'mvn release:prepare' which causes unwanted problems (scm 1.4 upgrade)
> ----------------------------------------------------------------------------------------------------------
>
> Key: MRELEASE-530
> URL: http://jira.codehaus.org/browse/MRELEASE-530
> Project: Maven 2.x Release Plugin
> Issue Type: Improvement
> Components: scm
> Reporter: Olivier Lamy
> Assignee: Olivier Lamy
> Priority: Minor
> Fix For: 2.1
>
>
> When doing 'mvn release:prepare' with a Git provider, a 'git push' command is executed. This is not ideal because the push command can fail or push things from the local repository that are not needed/wanted in the remote repository. Some examples are:
> 1. The local repository has two branches: master (tracking origin/master) and dummy (tracking origin/dummy). The release is being made on the master branch, and the dummy and origin/dummy branches have diverged. Running 'release:prepare' causes a 'git push', which will succeed for the master branch (assuming that the release preparation has been made correctly) and fail for the dummy branch (the two branches have diverged and need to be merged or rebased). The release preparation aborts and the directory is left in a somewhat inconsistent state where manual cleaning up is needed (removing pom.xml.next files, changing versions to <new>-SNAPSHOT, etc.)
> 2. The local repository has two branches: master (tracking origin/master) and localtest (not in the origin repository). The localtest branch shouldn't be published because it is just used for some temporary testing and doesn't even work. It will be pushed during 'release:prepare'.
> Suggested behaviour: use 'git push origin <currentbranch>:<currentbranch>', or even better, query for which remote repository to push to (found in .git/config) and which branch to push from and to. For me, it would be great to have a 'confirm push' before doing it so as to keep things clean, but maybe that is quite complex.
--
This message is automatically generated by JIRA.
-
If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa
-
For more information on JIRA, see: http://www.atlassian.com/software/jira
[jira] Moved: (MRELEASE-530) CLONE -Git provider does 'git push'
during 'mvn release:prepare' which causes unwanted problems
Posted by "Olivier Lamy (JIRA)" <ji...@codehaus.org>.
[ http://jira.codehaus.org/browse/MRELEASE-530?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]
Olivier Lamy moved SCM-536 to MRELEASE-530:
-------------------------------------------
Complexity: (was: Intermediate)
Component/s: (was: maven-scm-provider-git)
scm
Fix Version/s: (was: 1.4)
2.0.1
Affects Version/s: (was: 1.1)
Issue Type: Improvement (was: Bug)
Key: MRELEASE-530 (was: SCM-536)
Project: Maven 2.x Release Plugin (was: Maven SCM)
> CLONE -Git provider does 'git push' during 'mvn release:prepare' which causes unwanted problems
> -----------------------------------------------------------------------------------------------
>
> Key: MRELEASE-530
> URL: http://jira.codehaus.org/browse/MRELEASE-530
> Project: Maven 2.x Release Plugin
> Issue Type: Improvement
> Components: scm
> Reporter: Olivier Lamy
> Assignee: Olivier Lamy
> Priority: Minor
> Fix For: 2.0.1
>
>
> When doing 'mvn release:prepare' with a Git provider, a 'git push' command is executed. This is not ideal because the push command can fail or push things from the local repository that are not needed/wanted in the remote repository. Some examples are:
> 1. The local repository has two branches: master (tracking origin/master) and dummy (tracking origin/dummy). The release is being made on the master branch, and the dummy and origin/dummy branches have diverged. Running 'release:prepare' causes a 'git push', which will succeed for the master branch (assuming that the release preparation has been made correctly) and fail for the dummy branch (the two branches have diverged and need to be merged or rebased). The release preparation aborts and the directory is left in a somewhat inconsistent state where manual cleaning up is needed (removing pom.xml.next files, changing versions to <new>-SNAPSHOT, etc.)
> 2. The local repository has two branches: master (tracking origin/master) and localtest (not in the origin repository). The localtest branch shouldn't be published because it is just used for some temporary testing and doesn't even work. It will be pushed during 'release:prepare'.
> Suggested behaviour: use 'git push origin <currentbranch>:<currentbranch>', or even better, query for which remote repository to push to (found in .git/config) and which branch to push from and to. For me, it would be great to have a 'confirm push' before doing it so as to keep things clean, but maybe that is quite complex.
--
This message is automatically generated by JIRA.
-
If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa
-
For more information on JIRA, see: http://www.atlassian.com/software/jira