summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2005-07-15 01:02:10 (GMT)
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-15 17:00:35 (GMT)
commitc818566d5c585f9f82dabfbed82edcdd89ba4e5b (patch)
treeec3899c097165c98a5e8b795cca8660ede42bd49
parentec3f5a46eae8dd36995ff4709360417b55bc2d7d (diff)
downloadgit-c818566d5c585f9f82dabfbed82edcdd89ba4e5b.zip
git-c818566d5c585f9f82dabfbed82edcdd89ba4e5b.tar.gz
git-c818566d5c585f9f82dabfbed82edcdd89ba4e5b.tar.bz2
[PATCH] Update tags to record who made them
And finally what all of this has been leading up to. The 2 line code change to record who made a tag, and the 8 line code change to check that we recorded the tag. Gosh the error checking is always so much bigger than the code :) Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rwxr-xr-xgit-tag-script3
-rw-r--r--mktag.c10
2 files changed, 10 insertions, 3 deletions
diff --git a/git-tag-script b/git-tag-script
index aee4891..4124f54 100755
--- a/git-tag-script
+++ b/git-tag-script
@@ -7,6 +7,7 @@ name="$1"
object=${2:-$(cat "$GIT_DIR"/HEAD)}
type=$(git-cat-file -t $object) || exit 1
+tagger=$(git-var GIT_COMMITTER_IDENT) || exit 1
( echo "#"
echo "# Write a tag message"
@@ -17,7 +18,7 @@ grep -v '^#' < .editmsg | git-stripspace > .tagmsg
[ -s .tagmsg ] || exit
-( echo -e "object $object\ntype $type\ntag $name\n"; cat .tagmsg ) > .tmp-tag
+( 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"
diff --git a/mktag.c b/mktag.c
index 8cbbef6..585677e 100644
--- a/mktag.c
+++ b/mktag.c
@@ -42,7 +42,7 @@ static int verify_tag(char *buffer, unsigned long size)
int typelen;
char type[20];
unsigned char sha1[20];
- const char *object, *type_line, *tag_line;
+ const char *object, *type_line, *tag_line, *tagger_line;
if (size < 64 || size > MAXSIZE-1)
return -1;
@@ -92,6 +92,12 @@ static int verify_tag(char *buffer, unsigned long size)
return -1;
}
+ /* Verify the tagger line */
+ tagger_line = tag_line;
+
+ if (memcmp(tagger_line, "tagger", 6) || (tagger_line[6] == '\n'))
+ return -1;
+
/* The actual stuff afterwards we don't care about.. */
return 0;
}
@@ -119,7 +125,7 @@ int main(int argc, char **argv)
size += ret;
}
- // Verify it for some basic sanity: it needs to start with "object <sha1>\ntype "
+ // Verify it for some basic sanity: it needs to start with "object <sha1>\ntype\ntagger "
if (verify_tag(buffer, size) < 0)
die("invalid tag signature file");