diff options
author | Junio C Hamano <gitster@pobox.com> | 2020-01-30 14:17:11 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-01-30 14:17:11 -0800 |
commit | 7050624abceb6f7b4ca0ca7ddfce5831f8a40b8f (patch) | |
tree | 4530fc75ea5a006b83e55adb1951a033e377187b /templates | |
parent | Merge branch 'ds/refmap-doc' (diff) | |
parent | templates: fix deprecated type option `--bool` (diff) | |
download | tgif-7050624abceb6f7b4ca0ca7ddfce5831f8a40b8f.tar.xz |
Merge branch 'lh/bool-to-type-bool'
Replace "git config --bool" calls with "git config --type=bool" in
sample templates.
* lh/bool-to-type-bool:
templates: fix deprecated type option `--bool`
Diffstat (limited to 'templates')
-rwxr-xr-x | templates/hooks--pre-commit.sample | 2 | ||||
-rwxr-xr-x | templates/hooks--update.sample | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/templates/hooks--pre-commit.sample b/templates/hooks--pre-commit.sample index 6a75641638..e144712c85 100755 --- a/templates/hooks--pre-commit.sample +++ b/templates/hooks--pre-commit.sample @@ -16,7 +16,7 @@ else fi # If you want to allow non-ASCII filenames set this variable to true. -allownonascii=$(git config --bool hooks.allownonascii) +allownonascii=$(git config --type=bool hooks.allownonascii) # Redirect output to stderr. exec 1>&2 diff --git a/templates/hooks--update.sample b/templates/hooks--update.sample index 80ba94135c..5014c4b31c 100755 --- a/templates/hooks--update.sample +++ b/templates/hooks--update.sample @@ -43,11 +43,11 @@ if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then fi # --- Config -allowunannotated=$(git config --bool hooks.allowunannotated) -allowdeletebranch=$(git config --bool hooks.allowdeletebranch) -denycreatebranch=$(git config --bool hooks.denycreatebranch) -allowdeletetag=$(git config --bool hooks.allowdeletetag) -allowmodifytag=$(git config --bool hooks.allowmodifytag) +allowunannotated=$(git config --type=bool hooks.allowunannotated) +allowdeletebranch=$(git config --type=bool hooks.allowdeletebranch) +denycreatebranch=$(git config --type=bool hooks.denycreatebranch) +allowdeletetag=$(git config --type=bool hooks.allowdeletetag) +allowmodifytag=$(git config --type=bool hooks.allowmodifytag) # check for no description projectdesc=$(sed -e '1q' "$GIT_DIR/description") |