From 829ed79190d54696e5d248f4c2e49ec611e75e9e Mon Sep 17 00:00:00 2001 From: Peter van der Does Date: Tue, 20 Oct 2015 10:12:20 -0400 Subject: [PATCH 1/4] Directories filled incorrectly --- gitflow-common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitflow-common b/gitflow-common index 5412eeec..24166644 100644 --- a/gitflow-common +++ b/gitflow-common @@ -290,7 +290,7 @@ gitflow_is_initialized() { gitflow_load_settings() { export GIT_CURRENT_REPO_DIR="$(git rev-parse --show-toplevel 2>/dev/null)" DOT_GIT_DIR=$(git rev-parse --git-dir) - export DOT_GIT_DIR="(cd ${DOT_GIT_DIR} >/dev/null 2>&1 && pwd)" + export DOT_GIT_DIR="$(cd ${DOT_GIT_DIR} >/dev/null 2>&1 && pwd)" export HOOKS_DIR="$(git config --get gitflow.path.hooks || echo ${DOT_GIT_DIR}/hooks)" # the second option is used to support previous versions of git-flow export MASTER_BRANCH=$(git config --get gitflow.branch.master) export DEVELOP_BRANCH=$(git config --get gitflow.branch.develop) From 7cb86d936724e62b1f0c3da432450898660ea433 Mon Sep 17 00:00:00 2001 From: Peter van der Does Date: Tue, 20 Oct 2015 10:13:03 -0400 Subject: [PATCH 2/4] Version bump 1.9.1-rc.1 --- Changes.mdown | 2 +- git-flow-version | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Changes.mdown b/Changes.mdown index f96ed865..a96d81a4 100644 --- a/Changes.mdown +++ b/Changes.mdown @@ -26,7 +26,7 @@ # Changelog -#### 1.9.0-dev.59 +#### 1.9.1-rc.1 [Peter van der Does][petervanderdoes] * Add bugfix command. * Repositories with spaces in path cause the pre * post hook to fail. diff --git a/git-flow-version b/git-flow-version index 11e204ea..89cb1a58 100644 --- a/git-flow-version +++ b/git-flow-version @@ -35,7 +35,7 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -GITFLOW_VERSION=1.9.0-dev.59 +GITFLOW_VERSION=1.9.1-rc.1 initialize() { # A function can not be empty. Comments count as empty. From 7d735e5342d8588fd76c4f4f16f0745370997ec0 Mon Sep 17 00:00:00 2001 From: Peter van der Does Date: Tue, 20 Oct 2015 10:14:10 -0400 Subject: [PATCH 3/4] Update with changes --- Changes.mdown | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Changes.mdown b/Changes.mdown index a96d81a4..ba10cdc5 100644 --- a/Changes.mdown +++ b/Changes.mdown @@ -26,7 +26,11 @@ # Changelog -#### 1.9.1-rc.1 +#### 1.9.1-rc1 +[Peter van der Does][petervanderdoes] +* Bugfix: git-flow directories are not set correctly + +#### 1.9.0 [Peter van der Does][petervanderdoes] * Add bugfix command. * Repositories with spaces in path cause the pre * post hook to fail. From a97725608c2d2b230bbe2acf2e771dcec4d3119e Mon Sep 17 00:00:00 2001 From: Peter van der Does Date: Tue, 20 Oct 2015 10:14:23 -0400 Subject: [PATCH 4/4] Version bump 1.9.1 --- Changes.mdown | 2 +- git-flow-version | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Changes.mdown b/Changes.mdown index ba10cdc5..d87f1ad1 100644 --- a/Changes.mdown +++ b/Changes.mdown @@ -26,7 +26,7 @@ # Changelog -#### 1.9.1-rc1 +#### 1.9.1 [Peter van der Does][petervanderdoes] * Bugfix: git-flow directories are not set correctly diff --git a/git-flow-version b/git-flow-version index 89cb1a58..95a8957f 100644 --- a/git-flow-version +++ b/git-flow-version @@ -35,7 +35,7 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -GITFLOW_VERSION=1.9.1-rc.1 +GITFLOW_VERSION=1.9.1 initialize() { # A function can not be empty. Comments count as empty.