diff --git a/dev/githooks/pre-commit.d/02-check-copyright-header b/dev/githooks/pre-commit.d/02-check-copyright-header
index e29f3993..5c5d045a 100755
--- a/dev/githooks/pre-commit.d/02-check-copyright-header
+++ b/dev/githooks/pre-commit.d/02-check-copyright-header
@@ -1,47 +1,47 @@
 #!/bin/bash
 ###
 # Check all added or modified files that have a copyright line
 # for an up-to-date copyright year.
 # e.g. "Copyright (C) 2018-2019 The KPhotoAlbum Development Team"
 ###
 
 set -e
 
 if [[ -z "$CHECK_COPYRIGHT_HEADER" ]]
 then
-	CHECK_COPYRIGHT_HEADER=$(git config --default true --type bool --get kpa.checkCopyrightHeader)
+	CHECK_COPYRIGHT_HEADER=$(git config --bool --get kpa.checkCopyrightHeader || echo true)
 fi
 if [[ "$CHECK_COPYRIGHT_HEADER" == false ]]
 then
 	exit 0
 fi
 
 year=$(date +%Y)
 IFS=$'\n'
 for line in $(git status -s)
 do
 	# if the file is added or modified
 	if [[ $line == A* || $line == M* ]]
 	then
 		if head -n5 "${line:3}" | grep -q -i copyright
 		then
 			if ! head -n5 "${line:3}" | grep -q -i "copyright.*[ -]$year"
 			then
 				missing_year="$missing_year\n${line:3}"
 			fi
 		fi
 	fi
 done
 
 if [ -n "$missing_year" ]
 then
 	printf "Please update copyright year for the following files:$missing_year\n"
 	# also check if the Copyright statement in main.cpp is ok:
 	if ! grep -q -i "i18n(\"Copyright (C) 2003-$year " main.cpp
 	then
 		printf "...and also update the copyright statement in main.cpp!\n"
 	fi
 	printf "** You can suppress this check by setting 'git config kpa.checkCopyrightHeader false'\n"
 	printf "** or by setting the environment variable CHECK_COPYRIGHT_HEADER=false\n"
 	exit 1
 fi
diff --git a/dev/githooks/pre-commit.d/03-check-untracked_source_files b/dev/githooks/pre-commit.d/03-check-untracked_source_files
index 29b4e9c6..0021c522 100755
--- a/dev/githooks/pre-commit.d/03-check-untracked_source_files
+++ b/dev/githooks/pre-commit.d/03-check-untracked_source_files
@@ -1,25 +1,25 @@
 #!/bin/bash
 ###
 # Check for untracked C++ source files.
 ###
 
 set -e
 
 if [[ -z "$CHECK_UNTRACKED" ]]
 then
-	CHECK_UNTRACKED=$(git config --default true --type bool --get kpa.checkUntracked)
+	CHECK_UNTRACKED=$(git config --bool --get kpa.checkUntracked || echo true)
 fi
 if [[ "$CHECK_UNTRACKED" == false ]]
 then
 	exit 0
 fi
 
 retval=0
 untracked_files=$(git status -s | grep '^?? ' | grep '\.\(cpp\|h\)' | sed 's/^.../   /')
 if [[ -n "$untracked_files" ]]
 then
 	printf "Untracked files:\n$untracked_files\n"
 	printf "** You can suppress this check by setting 'git config kpa.checkUntracked false'\n"
 	printf "** or by setting the environment variable CHECK_UNTRACKED=false\n"
 	exit 1
 fi