[
http://jira.codehaus.org/browse/SCM-444?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=211759#action_211759
]
Kristian Rosenvold commented on SCM-444:
----------------------------------------
Please note that the issue as /originally/ filed can be solved using git >=
v1.6.3 using the following configuration:
git config push.default current
("tracking" option may also be used to the same effect, a --global flag can
also be used to make this global default)
See the push.default option on the following page
http://www.kernel.org/pub/software/scm/git/docs/git-config.html
Git 1.6.3 was not published at the time this issue was created. As we speak I
believe most platforms have >=1.6.3 in their available releases, so I am not
sure this
issue should be fixed for /this/ reason - although there may be other sensible
use cases for this
(Additionally I am also a bit sceptical at the "git fu" in use for the release
plugin. I really think the "released" version shouldn't be in the history of
the "master" branch, it should be a separate tag, as can be seen from the "1.2"
release in the attached image
(http://jira.codehaus.org/secure/attachment/47698/release_branch.jpg). The
"1.2.1" as shown in the image is made with the release plugin. From the
perspective of "push", I think the tag can/should be pushed, possibly even
force pushed. Force could be used when re-rolling releases)
> Git provider does 'git push' during 'mvn release:prepare' which causes
> unwanted problems
> ----------------------------------------------------------------------------------------
>
> Key: SCM-444
> URL: http://jira.codehaus.org/browse/SCM-444
> Project: Maven SCM
> Issue Type: Bug
> Components: maven-scm-provider-git
> Affects Versions: 1.1
> Reporter: Petter Måhlén
> Assignee: Mark Struberg
> Priority: Minor
> Attachments: release_branch.jpg, SCM-444.patch
>
>
> 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
