Can't finish hotfix - getopt does not support spaces in options

[opherv]

Can't finish hotfix - getopt does not support spaces in options

[OpherV]

Can you try git-flow AVH edition and see if it still happens?
https://github.com/petervanderdoes/gitflow

[joetjen]

have a look at nvie/gitflow#98 (comment) (the part about getopt especially)

mac's getopt has an issue with can be fixed - at least it worked for me
if that link is not working for you, you might find more about the topic on google.

Jan

[morganestes]

@joetjen I tried that one earlier, but it doesn't seem that PhpStorm is picking up the constants inside ~/.bashrc, so it's still broken.

Ahh, but putting it into ~/.bash_profile and restarting PhpStorm works, mostly. Now it finishes the hotfix, but leaves me on the hotfix branch inside PhpStorm:

16:23:42.555: cd /Users/morganestes/Documents/Websites/www.phase5system.dev
16:23:42.556: git flow hotfix finish -m "Tagging version test" test
Branches 'develop' and 'origin/develop' have diverged.
And local branch 'develop' is ahead of 'origin/develop'.
error: Cannot delete the branch 'hotfix/test' which you are currently on.
Summary of actions:
- Latest objects have been fetched from 'origin'
- Hotfix branch has been merged into 'master'
- The hotfix was tagged 'test'
- Hotfix branch has been back-merged into 'develop'
- Hotfix branch 'hotfix/test' has been deleted

[joetjen]

unfortunately I didn't managed to get the plugin to run on Maverick/IDEA Ultimate myself, so I am using SourceTree in conjunction with IDEA for the moment.

[OpherV]

I'm aware of the mac issue and working on a fix - which should hopefully be available in the next version

[iddqdidkfa]

I think 1ed07b8 will fix this issue aswell

[OpherV]

@morganestes Please check 0.3.4 (should be available on intellij repo soon as well) and let me know if the problem persists

[masakichi]

I met the same problem like @morganestes .
The error info is like his also.

This is my environment:

• OS: OS X 10.9.3
• IDE:PyCharm 3.4.1
• git: 2.0.0
• git-flow:0.4.1
• gitflow4idea:0.3.6

[masakichi]

@OpherV it solved. Thanks. What does the AVH mean?

[OpherV]

Well @nvie stopped updating git-flow a long time ago (last commit is over 2 years ago and you can see just how many open issues are there).

@petervanderdoes forked the original git-flow repo and called it AVH edition to address a lot of the issues that remained unsolved in the original as well as add new features.

I think AVH stands for "A Virtual Home", which is his software company but he can correct me if I'm wrong :)

[masakichi]

Thank you again! Nice explanation, glad to talk with you. @OpherV

[petervanderdoes]

@OpherV You are correct, AVH is just short for A Virtual Home. Thanks for the plug btw.