Skip to content
This repository was archived by the owner on Jun 19, 2023. It is now read-only.

Commit 5bdf3a6

Browse files
Explicitly get the default values from the system and global config.
1 parent 6410769 commit 5bdf3a6

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
# Changelog
4242

4343
#### 1.12.3-dev0
44-
* Preparation for next release
44+
* Explicitly get the default values from the system and global config.
4545

4646
#### 1.12.2
4747
* Missing parentheses (Thanks [Tiscs Sun][Tiscs] )

LICENSE

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ gitflow-shFlags is released under LGPL, see License #3
66
************************************************************
77

88
LICENSE #1:
9-
Copyright (c) 2012-2015 Peter van der Does
9+
Copyright (c) 2012-2019 Peter van der Does
1010
All rights reserved.
1111

1212
Redistribution and use in source and binary forms, with or without
@@ -563,4 +563,4 @@ necessary. Here is a sample; alter the names:
563563
<signature of Ty Coon>, 1 April 1990
564564
Ty Coon, President of Vice
565565

566-
That's all there is to it!
566+
That's all there is to it!

git-flow-init

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ file= use given config file
309309
if [ "$FLAGS_feature" != "" ]; then
310310
default_suggestion=$(echo $FLAGS_feature)
311311
else
312-
default_suggestion=$(git config --get gitflow.prefix.feature || echo feature/)
312+
default_suggestion=$(git config --get --system gitflow.prefix.feature || git config --get --global gitflow.prefix.feature || echo feature/)
313313
fi
314314
printf "Feature branches? [$default_suggestion] "
315315
if noflag defaults; then
@@ -326,7 +326,7 @@ file= use given config file
326326
if [ "$FLAGS_bugfix" != "" ]; then
327327
default_suggestion=$(echo $FLAGS_bugfix)
328328
else
329-
default_suggestion=$(git config --get gitflow.prefix.bugfix || echo bugfix/)
329+
default_suggestion=$(git config --get --system gitflow.prefix.bugfix || git config --get --global gitflow.prefix.bugfix || echo bugfix/)
330330
fi
331331
printf "Bugfix branches? [$default_suggestion] "
332332
if noflag defaults; then
@@ -343,7 +343,7 @@ file= use given config file
343343
if [ "$FLAGS_release" != "" ]; then
344344
default_suggestion=$(echo $FLAGS_release)
345345
else
346-
default_suggestion=$(git config --get gitflow.prefix.release || echo release/)
346+
default_suggestion=$(git config --get --system gitflow.prefix.release || git config --get --global gitflow.prefix.release || echo release/)
347347
fi
348348
printf "Release branches? [$default_suggestion] "
349349
if noflag defaults; then
@@ -360,7 +360,7 @@ file= use given config file
360360
if [ "$FLAGS_hotfix" != "" ]; then
361361
default_suggestion=$(echo $FLAGS_hotfix)
362362
else
363-
default_suggestion=$(git config --get gitflow.prefix.hotfix || echo hotfix/)
363+
default_suggestion=$(git config --get --system gitflow.prefix.hotfix || git config --get --global gitflow.prefix.hotfix || echo hotfix/)
364364
fi
365365
printf "Hotfix branches? [$default_suggestion] "
366366
if noflag defaults; then
@@ -377,7 +377,7 @@ file= use given config file
377377
if [ "$FLAGS_support" != "" ]; then
378378
default_suggestion=$(echo $FLAGS_support)
379379
else
380-
default_suggestion=$(git config --get gitflow.prefix.support || echo support/)
380+
default_suggestion=$(git config --get --system gitflow.prefix.support || git config --get --global gitflow.prefix.support || echo support/)
381381
fi
382382
printf "Support branches? [$default_suggestion] "
383383
if noflag defaults; then
@@ -394,7 +394,7 @@ file= use given config file
394394
if [ "$FLAGS_tag" != "" ]; then
395395
default_suggestion=$(echo $FLAGS_tag)
396396
else
397-
default_suggestion=$(git config --get gitflow.prefix.versiontag || echo "")
397+
default_suggestion=$(git config --get --system gitflow.prefix.versiontag || git config --get --global gitflow.prefix.versiontag || echo "")
398398
fi
399399
printf "Version tag prefix? [$default_suggestion] "
400400
if noflag defaults; then

0 commit comments

Comments
 (0)