Merge branch 'js/tag'

* js/tag:
verify-tag: also grok CR/LFs in the tag signature

diff --git a/builtin-verify-tag.c b/builtin-verify-tag.c
index dfcfcd0455ce471a6120d11bcbdb7553de59f536..cc4c55d7ee35ceeaf8c4a857d5dad857a7eb2664 100644 (file)
--- a/builtin-verify-tag.c
+++ b/builtin-verify-tag.c
@@ -35,7 +35,7 @@ static int run_gpg_verify(const char *buf, unsigned long size, int verbose)
 
        /* find the length without signature */
        len = 0;
-       while (len < size && prefixcmp(buf + len, PGP_SIGNATURE "\n")) {
+       while (len < size && prefixcmp(buf + len, PGP_SIGNATURE)) {
                eol = memchr(buf + len, '\n', size - len);
                len += eol ? eol - (buf + len) + 1 : size - len;
        }