Skip to content

Add CJS edition support. Fixes #349 #350

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.

Sign up for GitHub

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

Open
Beagon wants to merge 1 commit into
base: develop
Choose a base branch
from
+6 −6
Open

Add CJS edition support. Fixes #349 #350

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions GITFLOW_VERSION.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
The plugin requires that you have gitflow installed, specifically the [AVH edition](https://github.com/petervanderdoes/gitflow). This is because the [Vanilla Git Flow](https://github.com/nvie/gitflow) hasn't been maintained in years
The plugin requires that you have gitflow installed, specifically the [AVH edition](https://github.com/petervanderdoes/gitflow) or [CJS edition](https://github.com/CJ-Systems/gitflow-cjs) This is because the [Vanilla Git Flow](https://github.com/nvie/gitflow) hasn't been maintained in years

**How to check Git Flow version**

run `git flow version`

If it says `0.4.1` then you have the wrong version. You will have to uninstall it and then refer to [AVH edition](https://github.com/petervanderdoes/gitflow) docs for installation.
If it says `0.4.1` then you have the wrong version. You will have to uninstall it and then refer to [AVH edition](https://github.com/petervanderdoes/gitflow) or [CJS edition](https://github.com/CJ-Systems/gitflow-cjs) docs for installation.


**How to uninstall wrong version on OSX**
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Huge shoutout [to Kirill Likhodedov](https://github.com/klikh), who wrote much o

The plugin is available via the IntelliJ plugin manager. Just search for "Git Flow Integration" to get the latest version!

**The plugin requires that you have gitflow installed, specifically the [AVH edition](https://github.com/petervanderdoes/gitflow). This is because the [Vanilla Git Flow](https://github.com/nvie/gitflow) hasn't been maintained in years.** See this page [for details](https://github.com/OpherV/gitflow4idea/blob/develop/GITFLOW_VERSION.md)
**The plugin requires that you have gitflow installed, specifically the [AVH edition](https://github.com/petervanderdoes/gitflow) or [CJS edition](https://github.com/CJ-Systems/gitflow-cjs). This is because the [Vanilla Git Flow](https://github.com/nvie/gitflow) hasn't been maintained in years.** See this page [for details](https://github.com/OpherV/gitflow4idea/blob/develop/GITFLOW_VERSION.md)

## Caveats

Expand Down
6 changes: 3 additions & 3 deletions src/main/java/gitflow/GitflowVersionTester.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,13 @@ public String getVersion() {

/**
* Returns true if the {@code git flow} version can be determined
* and is any AVH version ({@code #contains("AVH")}) and
* and is any AVH version ({@code #contains("AVH")}) or CJS version ({@code #contains("CJS")}) and
* not the unmaintained NVIE version.
*
* @return true if we think the git flow version is an AVH version.
* @return true if we think the git flow version is an AVH or CJS version.
*/
public boolean isSupportedVersion() {
return version != null && version.contains("AVH");
return version != null && (version.contains("AVH") || version.contains("CJS"));
}

public void init(){
Expand Down