Merge branch 'maint'

diff --git a/contrib/examples/git-tag.sh b/contrib/examples/git-tag.sh
index ae7c5316664ce3aa14c567ddd9866499a5714eb7..e9f3a228af472c932f6cec5fa25ae49cd841b239 100755 (executable)
--- a/contrib/examples/git-tag.sh
+++ b/contrib/examples/git-tag.sh
@@ -167,7 +167,7 @@ type=$(git cat-file -t $object) || exit 1
 tagger=$(git-var GIT_COMMITTER_IDENT) || exit 1
 
 test -n "$username" ||
-       username=$(git repo-config user.signingkey) ||
+       username=$(git config user.signingkey) ||
        username=$(expr "z$tagger" : 'z\(.*>\)')
 
 trap 'rm -f "$GIT_DIR"/TAG_TMP* "$GIT_DIR"/TAG_FINALMSG "$GIT_DIR"/TAG_EDITMSG' 0