mirror of
https://github.com/git/git.git
synced 2024-11-16 06:03:44 +01:00
d67778eccd
I did this: $ git tag -s test-sign gpg: skipped "Andy Parkins <andyparkins@gmail.com>": secret key not available gpg: signing failed: secret key not available failed to sign the tag with GPG. The problem is that I have used the comment field in my key's UID definition. $ gpg --list-keys andy pub 1024D/4F712F6D 2003-08-14 uid Andy Parkins (Google) <andyparkins@gmail.com> So when git-tag looks for "Andy Parkins <andyparkins@gmail.com>"; obviously it's not going to be found. There shouldn't be a requirement that I use the same form of my name in my git repository and my gpg key - I might want to be formal (Andrew) in my gpg key and informal (Andy) in the repository. Further I might have multiple keys in my keyring, and might want to use one that doesn't match up with the address I use in commit messages. This patch adds a configuration entry "user.signingkey" which, if present, will be passed to the "-u" switch for gpg, allowing the tag signing key to be overridden. If the entry is not present, the fallback is the original method, which means existing behaviour will continue untouched. Signed-off-by: Andy Parkins <andyparkins@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
152 lines
3 KiB
Bash
Executable file
152 lines
3 KiB
Bash
Executable file
#!/bin/sh
|
|
# Copyright (c) 2005 Linus Torvalds
|
|
|
|
USAGE='-l [<pattern>] | [-a | -s | -u <key-id>] [-f | -d | -v] [-m <msg>] <tagname> [<head>]'
|
|
SUBDIRECTORY_OK='Yes'
|
|
. git-sh-setup
|
|
|
|
message_given=
|
|
annotate=
|
|
signed=
|
|
force=
|
|
message=
|
|
username=
|
|
list=
|
|
verify=
|
|
while case "$#" in 0) break ;; esac
|
|
do
|
|
case "$1" in
|
|
-a)
|
|
annotate=1
|
|
;;
|
|
-s)
|
|
annotate=1
|
|
signed=1
|
|
;;
|
|
-f)
|
|
force=1
|
|
;;
|
|
-l)
|
|
case "$#" in
|
|
1)
|
|
set x . ;;
|
|
esac
|
|
shift
|
|
git rev-parse --symbolic --tags | sort | grep "$@"
|
|
exit $?
|
|
;;
|
|
-m)
|
|
annotate=1
|
|
shift
|
|
message="$1"
|
|
if test "$#" = "0"; then
|
|
die "error: option -m needs an argument"
|
|
else
|
|
message_given=1
|
|
fi
|
|
;;
|
|
-F)
|
|
annotate=1
|
|
shift
|
|
if test "$#" = "0"; then
|
|
die "error: option -F needs an argument"
|
|
else
|
|
message="$(cat "$1")"
|
|
message_given=1
|
|
fi
|
|
;;
|
|
-u)
|
|
annotate=1
|
|
signed=1
|
|
shift
|
|
username="$1"
|
|
;;
|
|
-d)
|
|
shift
|
|
had_error=0
|
|
for tag
|
|
do
|
|
cur=$(git-show-ref --verify --hash -- "refs/tags/$tag") || {
|
|
echo >&2 "Seriously, what tag are you talking about?"
|
|
had_error=1
|
|
continue
|
|
}
|
|
git-update-ref -m 'tag: delete' -d "refs/tags/$tag" "$cur" || {
|
|
had_error=1
|
|
continue
|
|
}
|
|
echo "Deleted tag $tag."
|
|
done
|
|
exit $had_error
|
|
;;
|
|
-v)
|
|
shift
|
|
tag_name="$1"
|
|
tag=$(git-show-ref --verify --hash -- "refs/tags/$tag_name") ||
|
|
die "Seriously, what tag are you talking about?"
|
|
git-verify-tag -v "$tag"
|
|
exit $?
|
|
;;
|
|
-*)
|
|
usage
|
|
;;
|
|
*)
|
|
break
|
|
;;
|
|
esac
|
|
shift
|
|
done
|
|
|
|
name="$1"
|
|
[ "$name" ] || usage
|
|
prev=0000000000000000000000000000000000000000
|
|
if git-show-ref --verify --quiet -- "refs/tags/$name"
|
|
then
|
|
test -n "$force" || die "tag '$name' already exists"
|
|
prev=`git rev-parse "refs/tags/$name"`
|
|
fi
|
|
shift
|
|
git-check-ref-format "tags/$name" ||
|
|
die "we do not like '$name' as a tag 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
|
|
|
|
keyid=$(git-repo-config user.signingkey) ||
|
|
keyid=$(expr "z$tagger" : 'z\(.*>\)')
|
|
|
|
trap 'rm -f "$GIT_DIR"/TAG_TMP* "$GIT_DIR"/TAG_FINALMSG "$GIT_DIR"/TAG_EDITMSG' 0
|
|
|
|
if [ "$annotate" ]; then
|
|
if [ -z "$message_given" ]; then
|
|
( echo "#"
|
|
echo "# Write a tag message"
|
|
echo "#" ) > "$GIT_DIR"/TAG_EDITMSG
|
|
${VISUAL:-${EDITOR:-vi}} "$GIT_DIR"/TAG_EDITMSG || exit
|
|
else
|
|
echo "$message" >"$GIT_DIR"/TAG_EDITMSG
|
|
fi
|
|
|
|
grep -v '^#' <"$GIT_DIR"/TAG_EDITMSG |
|
|
git-stripspace >"$GIT_DIR"/TAG_FINALMSG
|
|
|
|
[ -s "$GIT_DIR"/TAG_FINALMSG -o -n "$message_given" ] || {
|
|
echo >&2 "No tag message?"
|
|
exit 1
|
|
}
|
|
|
|
( printf 'object %s\ntype %s\ntag %s\ntagger %s\n\n' \
|
|
"$object" "$type" "$name" "$tagger";
|
|
cat "$GIT_DIR"/TAG_FINALMSG ) >"$GIT_DIR"/TAG_TMP
|
|
rm -f "$GIT_DIR"/TAG_TMP.asc "$GIT_DIR"/TAG_FINALMSG
|
|
if [ "$signed" ]; then
|
|
gpg -bsa -u "$keyid" "$GIT_DIR"/TAG_TMP &&
|
|
cat "$GIT_DIR"/TAG_TMP.asc >>"$GIT_DIR"/TAG_TMP ||
|
|
die "failed to sign the tag with GPG."
|
|
fi
|
|
object=$(git-mktag < "$GIT_DIR"/TAG_TMP)
|
|
fi
|
|
|
|
git update-ref "refs/tags/$name" "$object" "$prev"
|
|
|