summaryrefslogtreecommitdiff
path: root/fsck.c
diff options
context:
space:
mode:
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>2021-01-05 19:42:49 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-01-05 22:58:29 (GMT)
commit9a1a3a4d4c5648b94dbe8f34b83271d96dbaa6ec (patch)
treecd8de67b32e521358625d1e28c1686b2eeb6e487 /fsck.c
parentacfc01332bc477e19b8af6b5002c0b962fde3326 (diff)
downloadgit-9a1a3a4d4c5648b94dbe8f34b83271d96dbaa6ec.zip
git-9a1a3a4d4c5648b94dbe8f34b83271d96dbaa6ec.tar.gz
git-9a1a3a4d4c5648b94dbe8f34b83271d96dbaa6ec.tar.bz2
mktag: allow omitting the header/body \n separator
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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'fsck.c')
-rw-r--r--fsck.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fsck.c b/fsck.c
index 9c3a594..69d0049 100644
--- a/fsck.c
+++ b/fsck.c
@@ -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")) {
/*