summaryrefslogtreecommitdiff
path: root/git-tag-script
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-07-23 22:21:22 (GMT)
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-23 22:21:22 (GMT)
commitd727782eaf85d7bbf49e666776deadd3fee85715 (patch)
treed763af06625117ddff266e8bb0a2bb62e32a7d02 /git-tag-script
parent1d8fa411e04130e175eae7a41e0918e4be7797a5 (diff)
downloadgit-d727782eaf85d7bbf49e666776deadd3fee85715.zip
git-d727782eaf85d7bbf49e666776deadd3fee85715.tar.gz
git-d727782eaf85d7bbf49e666776deadd3fee85715.tar.bz2
Make "git tag" create both simple and signed tags
A simple tag is just a direct pointer to the object, while a signed tag is a pointer to a "tag object" that has a pgp signature and points to the object we tagged. Use "git tag -s tagname" to create a signed tag. The "-f" flag overwrites any previous tag of that name (useful if you update a tag to point to a newer version for things like "latest" etc tags that aren't necessarily static versions).
Diffstat (limited to 'git-tag-script')
-rwxr-xr-xgit-tag-script50
1 files changed, 38 insertions, 12 deletions
diff --git a/git-tag-script b/git-tag-script
index 4124f54..c375a84 100755
--- a/git-tag-script
+++ b/git-tag-script
@@ -2,25 +2,51 @@
# Copyright (c) 2005 Linus Torvalds
. git-sh-setup-script || die "Not a git archive"
+
+signed=
+force=
+while case "$#" in 0) break ;; esac
+do
+ case "$1" in
+ -s)
+ signed=1
+ ;;
+ -f)
+ force=1
+ ;;
+ *)
+ break
+ ;;
+ esac
+ shift
+done
+
name="$1"
[ "$name" ] || die "I need a tag-name"
+[ -e "$GIT_DIR/refs/tags/$name" ] &&
+ [ "$force" ] || die "tag '$name' already exists"
+shift
-object=${2:-$(cat "$GIT_DIR"/HEAD)}
+object=$(git-rev-parse --verify --revs-only --default HEAD "$@") || exit 1
type=$(git-cat-file -t $object) || exit 1
tagger=$(git-var GIT_COMMITTER_IDENT) || exit 1
-( echo "#"
- echo "# Write a tag message"
- echo "#" ) > .editmsg
-${VISUAL:-${EDITOR:-vi}} .editmsg || exit
+if [ "$signed" ]; then
+ ( echo "#"
+ echo "# Write a tag message"
+ echo "#" ) > .editmsg
+ ${VISUAL:-${EDITOR:-vi}} .editmsg || exit
+
+ grep -v '^#' < .editmsg | git-stripspace > .tagmsg
-grep -v '^#' < .editmsg | git-stripspace > .tagmsg
+ [ -s .tagmsg ] || exit
-[ -s .tagmsg ] || exit
+ ( echo -e "object $object\ntype $type\ntag $name\ntagger $tagger\n"; cat .tagmsg ) > .tmp-tag
+ rm -f .tmp-tag.asc .tagmsg
+ gpg -bsa .tmp-tag && cat .tmp-tag.asc >> .tmp-tag
+ object=$(git-mktag < .tmp-tag)
+ rm -f .tmp-tag .tmp-tag.sig
+fi
-( echo -e "object $object\ntype $type\ntag $name\ntagger $tagger\n"; cat .tagmsg ) > .tmp-tag
-rm -f .tmp-tag.asc .tagmsg
-gpg -bsa .tmp-tag && cat .tmp-tag.asc >> .tmp-tag
mkdir -p "$GIT_DIR/refs/tags"
-git-mktag < .tmp-tag > "$GIT_DIR/refs/tags/$name"
-#rm .tmp-tag .tmp-tag.sig
+echo $object > "$GIT_DIR/refs/tags/$name"