From b5dd85d762c8579d332a3e83b0b999015cbfc265 Mon Sep 17 00:00:00 2001 From: Silas Palmer Date: Mon, 18 Jun 2018 09:51:40 +1000 Subject: [PATCH 1/2] Fix "Not a gitflow-enabled repo" bug https://github.com/petervanderdoes/gitflow-avh/issues/372 Fix "Not a gitflow-enabled repo" bug - issue reported at https://github.com/petervanderdoes/gitflow-avh/issues/372 --- gitflow-common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitflow-common b/gitflow-common index 15bb6a1f..c0aa4cef 100644 --- a/gitflow-common +++ b/gitflow-common @@ -294,7 +294,7 @@ gitflow_is_initialized() { gitflow_has_master_configured && \ gitflow_has_develop_configured && \ [ "$(git config --get gitflow.branch.master)" != "$(git config --get gitflow.branch.develop)" ] && \ - $(git config --get-regexp gitflow.prefix >/dev/null 2>&1) + ! $(git config --get-regexp gitflow.prefix >/dev/null 2>&1) } # Loading settings that can be overridden using git config From 4308ea3adf35cfd617dda0106cf8d7a035e07d3d Mon Sep 17 00:00:00 2001 From: Silas Palmer Date: Fri, 22 Jun 2018 09:14:49 +1000 Subject: [PATCH 2/2] Comparability change for git for windows --- gitflow-common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitflow-common b/gitflow-common index c0aa4cef..4ab08c0c 100644 --- a/gitflow-common +++ b/gitflow-common @@ -294,7 +294,7 @@ gitflow_is_initialized() { gitflow_has_master_configured && \ gitflow_has_develop_configured && \ [ "$(git config --get gitflow.branch.master)" != "$(git config --get gitflow.branch.develop)" ] && \ - ! $(git config --get-regexp gitflow.prefix >/dev/null 2>&1) + git config --get-regexp gitflow.prefix >/dev/null 2>&1 } # Loading settings that can be overridden using git config