Merge branch 'release/1.9.1'

petervanderdoes · Oct 20, 2015 · 43548ed · 43548ed
2 parents f25391a + a977256
commit 43548ed
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/Changes.mdown b/Changes.mdown
@@ -26,7 +26,11 @@
 
 # Changelog
 
-#### 1.9.0-dev.59
+#### 1.9.1
+[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.

diff --git 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
 
 initialize() {
 	# A function can not be empty. Comments count as empty.

diff --git 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)