From 5d071584fb80629cae8dd6ee899daa7557a80dd0 Mon Sep 17 00:00:00 2001 From: Peter van der Does Date: Thu, 18 Dec 2014 11:20:18 -0500 Subject: [PATCH] Refactoring a little bit --- git-flow-init | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/git-flow-init b/git-flow-init index 5e308d665..79b4431c7 100644 --- a/git-flow-init +++ b/git-flow-init @@ -65,14 +65,14 @@ showcommands! Show git commands while executing them d,[no]defaults Use default branch naming conventions f,[no]force Force setting of gitflow branches, even if already configured - Use config file location +Use config file location local! use repository config file global! use global config file system! use system config file file= use given config file " local gitflow_config_option should_check_existence branchcount guess - local master_branch develop_branch default_suggestion answer prefix + local master_branch develop_branch default_suggestion answer prefix # Define flags DEFINE_boolean 'force' false 'force setting of gitflow branches, even if already configured' f @@ -343,7 +343,7 @@ file= use given config file # Paths if ! git config --get gitflow.path.hooks >/dev/null 2>&1 || flag force; then DOT_GIT_DIR=$(git rev-parse --git-dir) - DOT_GIT_DIR=$(cd "$DOT_GIT_DIR" 2>&1 >/dev/null && pwd) + DOT_GIT_DIR=$(cd "$DOT_GIT_DIR" >/dev/null 2>&1 && pwd) default_suggestion=$(git config --get gitflow.path.hooks || echo "$DOT_GIT_DIR"/hooks) printf "Hooks and filters directory? [$default_suggestion] " if noflag defaults; then