@@ -987,6 +987,8 @@ int fsck_tag_standalone(const struct object_id *oid, const char *buffer,
}
else
ret = fsck_ident(&buffer, oid, OBJ_TAG, options);
+ if (!*buffer)
+ goto done;
if (!starts_with(buffer, "\n")) {
/*
@@ -432,8 +432,9 @@ tag mytag
tagger T A Gger <tagger@example.com> 1206478233 -0500
EOF
-check_verify_failure 'disallow no header / body newline separator' \
- '^error:.* extraHeaderEntry:'
+test_expect_success 'allow no header / body newline separator' '
+ git mktag <tag.sig
+'
############################################################
# 24. create valid tag
@@ -443,7 +444,6 @@ object $head
type commit
tag mytag
tagger T A Gger <tagger@example.com> 1206478233 -0500
-
EOF
test_expect_mktag_success 'create valid tag object'
Change mktag's acceptance rules to accept an empty body without an empty line after the header again. This fixes an ancient unintended dregression in "mktag". When "mktag" was introduced in ec4465adb3 (Add "tag" objects that can be used to sign other objects., 2005-04-25) the input checks were much looser. When it was documented it 6cfec03680 (mktag: minimally update the description., 2007-06-10) it was clearly intended for this \n to be optional: The message, when [it] exists, is separated by a blank line from the header. But then in e0aaf781f6 (mktag.c: improve verification of tagger field and tests, 2008-03-27) this was made an error, seemingly by accident. It was just a result of the general header checks, and all the tests after that patch have a trailing empty line (but did not before). Let's allow this again, and tweak the test semantics changed in e0aaf781f6 to remove the redundant empty line. New tests added in previous commits of mine already added an explicit test for allowing the empty line between header and body. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> --- fsck.c | 2 ++ t/t3800-mktag.sh | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-)