Skip to content
This repository has been archived by the owner on Jun 19, 2023. It is now read-only.

Restores previous default branch prefixes, closes #393 #394

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from

Conversation

adamrodger
Copy link

Fixes #393

The prefixes are now the values that were used previously, e.g.:

$ git flow init -d
Initialized empty Git repository in /tmp/test/.git/
Using default branch names.
No branches exist yet. Base branches must be created now.
Branch name for production releases: [master]
Branch name for "next release" development: [develop]

How to name your supporting branch prefixes?
Feature branches? [feature/]
Bugfix branches? [bugfix/]
Release branches? [release/]
Hotfix branches? [hotfix/]
Support branches? [support/]
Version tag prefix? []
Hooks and filters directory? [/tmp/test/.git/hooks]

@27Bslash6
Copy link

Can we get this merged and a new release ASAP please, the latest release has broken our builds due to this changed behaviour.

27Bslash6 pushed a commit to greenpeace/planet4-circleci that referenced this pull request Jan 25, 2019
Circumvent breaking change in latest version: 
petervanderdoes/gitflow-avh#394
27Bslash6 pushed a commit to greenpeace/planet4-circleci that referenced this pull request Jan 25, 2019
* release/v0.6.45:
  🥚 🐔
  Ensure new release version is numeric, optional leading 'v'
  Increase specificity of old release detection
  Formatting
  Use default curl parameters to download googleSDK
  Pin gitflow version to 1.11.0. Circumvent breaking change in latest version: petervanderdoes/gitflow-avh#394
  Verbose notification for API builds
27Bslash6 pushed a commit to greenpeace/planet4-circleci that referenced this pull request Jan 25, 2019
 - 🤖 Automated promotion

* release/v0.6.45:
  🥚 🐔
  Ensure new release version is numeric, optional leading 'v'
  Increase specificity of old release detection
  Formatting
  Use default curl parameters to download googleSDK
  Pin gitflow version to 1.11.0. Circumvent breaking change in latest version: petervanderdoes/gitflow-avh#394
  Verbose notification for API builds [skip ci]
@AndydeCleyre
Copy link

I don't know what plans were for next release, but please please prioritize a release with this in it!

@adamrodger
Copy link
Author

@petervanderdoes it appears you've reimplemented my changes from this PR and not given me any credit for it which seems a bit unfair to the community. I did the hard work to actually find and fix this issue.

For what it's worth, I also reviewed the merged changes and I still think my implementation is clearer and neater.

@petervanderdoes
Copy link
Owner

My apologies @adamrodger I saw an email when I got to work and quickly made some changes without checking if there were PR's or not.

I will add your name to the changelog.

I just checked your code and wanted to comment on my implementation compared to yours.

My thought process is that if you use a parameter you explicitly tell the software that the given name is the name you want. In your implementation it still checks if there is a setting in a configuration somewhere and that would take precedent over the parameter.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

git flow init -d uses empty branch prefixes for everything
4 participants