Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added "bugfix" kind of branch #3812

Merged
merged 1 commit into from Jul 18, 2017
Merged

Conversation

gpongelli
Copy link
Contributor

Feature #3811

Changes proposed in this pull request:

  • Added "bugfix" as branch type for gitflow dialog

How did I test this code:

  • Open GitFlow dialog on an gitflow initialized repository
  • Check that the branch type combobox lists "bugfix"

@@ -160,7 +161,7 @@ private void DisplayBranchDatas()
private void LoadBaseBranches()
{
var branchType = cbType.SelectedValue.ToString();
var manageBaseBranch = (branchType == Branch.feature.ToString("G") || branchType == Branch.hotfix.ToString("G") || branchType == Branch.support.ToString("G"));
var manageBaseBranch = (branchType == Branch.feature.ToString("G") || branchType == Branch.hotfix.ToString("G") || branchType == Branch.support.ToString("G") || branchType == Branch.bugfix.ToString("G"));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if manageBaseBranch is anything but Branch.release shouldn't it be simplified to

var manageBaseBranch = branchType != Branch.release.ToString("G");

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're right, just pushed the change.

Bugfix kind of branch added into LoadBaseBranch

Check changed on manageBaseBranch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants