Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 473646 - Finishing a release is tagging develop branch instead of master
Summary: Finishing a release is tagging develop branch instead of master
Status: RESOLVED FIXED
Alias: None
Product: EGit
Classification: Technology
Component: Gitflow (show other bugs)
Version: 4.0   Edit
Hardware: All All
: P3 normal with 1 vote (vote)
Target Milestone: ---   Edit
Assignee: Max Hohenegger CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2015-07-27 08:07 EDT by Peter Boughton CLA
Modified: 2015-09-09 05:26 EDT (History)
1 user (show)

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Peter Boughton CLA 2015-07-27 08:07:12 EDT 
When a release is finished, git-flow should be tagging the master branch.

See http://nvie.com/posts/a-successful-git-branching-model/#finishing-a-release-branch

This plugin is incorrectly tagging the develop branch.
Comment 1 Peter Boughton CLA 2015-07-27 10:18:58 EDT 
This is an issue with behaviour of both release and hotfix branches.

The finish release behaviour is correctly merging to both branches, but tagging the wrong one.
The hotfix behaviour is only merging to develop.

Hotfix behaviour is:
start -> branch from master (correct)
finish -> merge hotfix to develop (correct)
finish -> tag develop (incorrect - should tag master)
finish -> remove hotfix branch (correct)

Hotfix behaviour should be:
start -> branch from master
finish -> merge hotfix to master
finish -> tag master as hotfix-{hotfix}
finish -> merge hotfix to develop
finish -> remove hotfix branch

Release behaviour should be:
start -> branch from develop
finish -> merge hotfix to master
finish -> tag master as {versiontag}{release}
finish -> merge hotfix to develop
finish -> remove hotfix branch

On the tagging front, there is a versiontag property (defaults to blank, but can be set to "v" or whatever), there should probably be a hotfixtag property that works accordingly for hotfix tags.
Comment 2 Peter Boughton CLA 2015-07-27 10:30:06 EDT 
Sorry, didn't test correctly before (appears I merged a branch with no changes on, so that's why master seemed unaffected) - when done correctly the hotfix branch *is* merged into both master and develop - it's only the tagging that is incorrect.
Comment 3 Max Hohenegger CLA 2015-08-05 04:04:17 EDT 
https://git.eclipse.org/r/#/c/52635/
Comment 4 Eclipse Genie CLA 2015-09-07 08:15:57 EDT 
Gerrit change https://git.eclipse.org/r/52635 was merged to [master].
Commit: http://git.eclipse.org/c/egit/egit.git/commit/?id=00aaabadbcf41e3a1efe89e274d5d0d32f36dac9
Comment 5 Max Hohenegger CLA 2015-09-09 05:26:24 EDT 
Fixed. See Gerrit change.