Explicitly get the default values from the system and global config.

petervanderdoes · May 23, 2019 · 5bdf3a6 · 5bdf3a6
1 parent 6410769
commit 5bdf3a6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -41,7 +41,7 @@
 # Changelog
 
 #### 1.12.3-dev0
-* Preparation for next release
+* Explicitly get the default values from the system and global config.
 
 #### 1.12.2
 * Missing parentheses (Thanks [Tiscs Sun][Tiscs] )

diff --git a/LICENSE b/LICENSE
@@ -6,7 +6,7 @@ gitflow-shFlags is released under LGPL, see License #3
 ************************************************************
 
 LICENSE #1:
-Copyright (c) 2012-2015 Peter van der Does
+Copyright (c) 2012-2019 Peter van der Does
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -563,4 +563,4 @@ necessary.  Here is a sample; alter the names:
   <signature of Ty Coon>, 1 April 1990
   Ty Coon, President of Vice
 
-That's all there is to it!
+That's all there is to it!
diff --git a/git-flow-init b/git-flow-init
@@ -309,7 +309,7 @@ file=    use given config file
 	    if [ "$FLAGS_feature" != "" ]; then
 	        default_suggestion=$(echo $FLAGS_feature)
         else
-	    	default_suggestion=$(git config --get gitflow.prefix.feature || echo feature/)
+	    	default_suggestion=$(git config --get --system gitflow.prefix.feature || git config --get --global gitflow.prefix.feature || echo feature/)
         fi
 		printf "Feature branches? [$default_suggestion] "
 		if noflag defaults; then
@@ -326,7 +326,7 @@ file=    use given config file
 	    if [ "$FLAGS_bugfix" != "" ]; then
 	        default_suggestion=$(echo $FLAGS_bugfix)
         else
-		    default_suggestion=$(git config --get gitflow.prefix.bugfix || echo bugfix/)
+		    default_suggestion=$(git config --get --system gitflow.prefix.bugfix || git config --get --global gitflow.prefix.bugfix || echo bugfix/)
         fi
 		printf "Bugfix branches? [$default_suggestion] "
 		if noflag defaults; then
@@ -343,7 +343,7 @@ file=    use given config file
 	    if [ "$FLAGS_release" != "" ]; then
 	        default_suggestion=$(echo $FLAGS_release)
         else
-		    default_suggestion=$(git config --get gitflow.prefix.release || echo release/)
+		    default_suggestion=$(git config --get --system gitflow.prefix.release || git config --get --global gitflow.prefix.release || echo release/)
         fi
 		printf "Release branches? [$default_suggestion] "
 		if noflag defaults; then
@@ -360,7 +360,7 @@ file=    use given config file
 	    if [ "$FLAGS_hotfix" != "" ]; then
 	        default_suggestion=$(echo $FLAGS_hotfix)
         else
-		    default_suggestion=$(git config --get gitflow.prefix.hotfix || echo hotfix/)
+		    default_suggestion=$(git config --get --system gitflow.prefix.hotfix || git config --get --global gitflow.prefix.hotfix || echo hotfix/)
         fi
 		printf "Hotfix branches? [$default_suggestion] "
 		if noflag defaults; then
@@ -377,7 +377,7 @@ file=    use given config file
 	    if [ "$FLAGS_support" != "" ]; then
 	        default_suggestion=$(echo $FLAGS_support)
         else
-		    default_suggestion=$(git config --get gitflow.prefix.support || echo support/)
+		    default_suggestion=$(git config --get --system gitflow.prefix.support || git config --get --global gitflow.prefix.support || echo support/)
         fi
 		printf "Support branches? [$default_suggestion] "
 		if noflag defaults; then
@@ -394,7 +394,7 @@ file=    use given config file
 	    if [ "$FLAGS_tag" != "" ]; then
 		    default_suggestion=$(echo $FLAGS_tag)
         else
-            default_suggestion=$(git config --get gitflow.prefix.versiontag || echo "")
+            default_suggestion=$(git config --get --system gitflow.prefix.versiontag || git config --get --global gitflow.prefix.versiontag || echo "")
         fi
 		printf "Version tag prefix? [$default_suggestion] "
 		if noflag defaults; then