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

Unsupported Git Flow version #302

Closed
1 task done
SKProCH opened this issue May 6, 2020 · 11 comments
Closed
1 task done

Unsupported Git Flow version #302

SKProCH opened this issue May 6, 2020 · 11 comments

Comments

@SKProCH
Copy link

SKProCH commented May 6, 2020

  • I'm submitting a ...

    • bug report
  • Is this a bug? Sorry about that. If so give me explicit details how to reproduce:

  1. Open Rider
  2. image
  3. Profit
  • Gitflow4idea version: 0.7.2

  • Gitflow version: 1.12.3 (AVH Edition)

  • JetBrains Rider 2020.1.1
    Build #RD-201.6668.201, built on April 28, 2020
    Runtime version: 11.0.6+8-b765.25 amd64
    VM: OpenJDK 64-Bit Server VM by JetBrains s.r.o
    .NET Framework 4.0.30319.42000
    Windows 10 10.0

This message began to appear after updating the plugin on the latest version.
image

@driici
Copy link

driici commented May 6, 2020

HI. same with PhpStorm 2020.1.1 Build #PS-201.7223.96, built on April 30, 2020
Also it works on some of my repositories (all with same origin server, different creation dates). I have also tried to clone repo to new directory; however it didnt help either.

@OpherV
Copy link
Owner

OpherV commented May 6, 2020

@SKProCH @driici can you check if it's the same issue like #299 ?

@driici
Copy link

driici commented May 6, 2020

@SKProCH @driici can you check if it's the same issue like #299 ?

copying misc.xml from other project wokerd for me. Sorry, did not find that isssue earlier. But from content of misc.xml there is no specific configuration for my current project and for git flow neither. I think at least change of message will be in order, since old CLI is different case, than missing some XML; PHPStorm creates some xml files in .idea only if they are needed. So if there is nothing to write to misc.xml it does not exists.

@OpherV
Copy link
Owner

OpherV commented May 6, 2020

@driici oh it's definitely a bug - it shouldn't happen at all :)
I'll try and tackle it for next version but in the meanwhile this is a solution so that you're not stuck.

@driici
Copy link

driici commented May 6, 2020

@OpherV Thank you very much!

@targzeta
Copy link

targzeta commented May 6, 2020

I have the same problem. The file .idea/misc.xml doesn't exists and I have no idea what to write to.

If I simply "touch" the file, the plugin shows 'No Gitflow'. The 'Init Repo' option do nothing.

This is is a Perl project. The .git/config says:

[branch "master"]
        remote = origin
        merge = refs/heads/master
[branch "develop"]
        remote = origin
        merge = refs/heads/develop
[gitflow "branch"]
        master = master
        develop = develop
[gitflow "prefix"]
        feature = feature/
        release = release/
        hotfix = hotfix/
        support = support/
        versiontag = 
[branch "release/1.5.0"]
        remote = origin
        merge = refs/heads/release/1.5.0

and here:

$> git flow version 
1.12.4-dev0 (AVH Edition)

Best regards,
Emanuele

@OpherV
Copy link
Owner

OpherV commented May 7, 2020

@targzeta remove this:

[gitflow "branch"]
        master = master
        develop = develop
[gitflow "prefix"]
        feature = feature/
        release = release/
        hotfix = hotfix/
        support = support/
        versiontag = 

Re-init gitflow. It should sort it out

@SKProCH
Copy link
Author

SKProCH commented May 7, 2020

Yes, for me this problem is identical to that described in #299.
I copied misc.xml from the newly created project. But why is this happening and how to fix it automatically?

@targzeta
Copy link

targzeta commented May 8, 2020

@targzeta remove this:

[gitflow "branch"]
        master = master
        develop = develop
[gitflow "prefix"]
        feature = feature/
        release = release/
        hotfix = hotfix/
        support = support/
        versiontag = 

Re-init gitflow. It should sort it out

It works if:

  • I don't have any [gitflow] directives whitin .git/config file
  • I create and fill the .idea/misc.xml with:
<?xml version="1.0" encoding="UTF-8"?>
<project version="4" />

Is it possible to make it works also without misc.xml file?

Thank you in advance,
Emanuele

@OpherV
Copy link
Owner

OpherV commented May 8, 2020

@targzeta of course. A fix is planned for next version

@OpherV
Copy link
Owner

OpherV commented May 22, 2020

Fix in 0.7.3 now out

@OpherV OpherV closed this as completed May 22, 2020
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

No branches or pull requests

4 participants