Bug 468885 - [gitflow] Gerrit integration
Summary: [gitflow] Gerrit integration
Status: NEW
Alias: None
Product: EGit
Classification: Technology
Component: Gitflow (show other bugs)
Version: unspecified   Edit
Hardware: All All
: P3 normal (vote)
Target Milestone: ---   Edit
Assignee: Max Hohenegger CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on: 471026
Blocks:
  Show dependency tree
 
Reported: 2015-05-30 12:31 EDT by Max Hohenegger CLA
Modified: 2015-06-25 11:15 EDT (History)
0 users

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 Max Hohenegger CLA 2015-05-30 12:31:00 EDT 
Using Gitflow feature branches in combination with Gerrit reviews can be tricky, and requires some manual work. A common workflow is to "merge --squash" onto develop, as soon as a feature is finished and ready for review. The user then has to edit the commit message, and afterwards push to Gerrit. Finally, the feature branch should to be deleted.

Given that a repository is configured for Gerrit and for Gitflow, all of the above could be handled by a Gerrit-specific FeatureFinishOperation.

Since this is non-standard Gitflow behavior, probably the user should be asked at first invocation, if that is what he wants.
Comment 1 Max Hohenegger CLA 2015-06-09 16:55:57 EDT 
Another issue is the publishing of feature branches.
Using the EGit Gerrit integration, the remote origin refspec is configured for Gerrit, which means every commit in the feature branch will trigger a review, when published.
The Gitflow integration could let the user choose which remote to use, or even create a new one, with a refspec that does not trigger reviews.