Merge branch 'maint'

diff --git a/git-tag.sh b/git-tag.sh
index 94499c9b367800249e74a0e891dd14eb968f8857..4a0a7b660780b7c377ce80ac49dc99cea3e8137d 100755 (executable)
--- a/git-tag.sh
+++ b/git-tag.sh
@@ -112,7 +112,10 @@ git-check-ref-format "tags/$name" ||
 object=$(git-rev-parse --verify --default HEAD "$@") || exit 1
 type=$(git-cat-file -t $object) || exit 1
 tagger=$(git-var GIT_COMMITTER_IDENT) || exit 1
-: ${username:=$(expr "z$tagger" : 'z\(.*>\)')}
+
+test -n "$username" ||
+       username=$(git-repo-config user.signingkey) ||
+       username=$(expr "z$tagger" : 'z\(.*>\)')
 
 trap 'rm -f "$GIT_DIR"/TAG_TMP* "$GIT_DIR"/TAG_FINALMSG "$GIT_DIR"/TAG_EDITMSG' 0