undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] Update tags to record who made them

Browse Source 
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>
This commit is contained in:
Eric W. Biederman 2005-07-14 19:02:10 -06:00 committed by Linus Torvalds
parent ec3f5a46ea
commit c818566d5c
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
git-tag-script
View File

@ -7,6 +7,7 @@ name="$1"
object=${2:-$(cat "$GIT_DIR"/HEAD)} object=${2:-$(cat "$GIT_DIR"/HEAD)}
type=$(git-cat-file -t $object) || exit 1 type=$(git-cat-file -t $object) || exit 1
tagger=$(git-var GIT_COMMITTER_IDENT) || exit 1
( echo "#" ( echo "#"
echo "# Write a tag message" echo "# Write a tag message"
@ -17,7 +18,7 @@ grep -v '^#' < .editmsg | git-stripspace > .tagmsg
[ -s .tagmsg ] || exit [ -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 rm -f .tmp-tag.asc .tagmsg
gpg -bsa .tmp-tag && cat .tmp-tag.asc >> .tmp-tag gpg -bsa .tmp-tag && cat .tmp-tag.asc >> .tmp-tag
mkdir -p "$GIT_DIR/refs/tags" mkdir -p "$GIT_DIR/refs/tags"

10
mktag.c
View File

@ -42,7 +42,7 @@ static int verify_tag(char *buffer, unsigned long size)
int typelen; int typelen;
char type[20]; char type[20];
unsigned char sha1[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) if (size < 64 || size > MAXSIZE-1)
return -1; return -1;
@ -92,6 +92,12 @@ static int verify_tag(char *buffer, unsigned long size)
return -1; 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.. */ /* The actual stuff afterwards we don't care about.. */
return 0; return 0;
} }
@ -119,7 +125,7 @@ int main(int argc, char **argv)
size += ret; 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) if (verify_tag(buffer, size) < 0)
die("invalid tag signature file"); die("invalid tag signature file");