summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-09-14 22:37:55 -0700
committerJunio C Hamano <gitster@pobox.com>2007-09-14 22:37:55 -0700
commit07efafef2bcd87b35bf8880364dd5d098058cd4e (patch)
treeab93ece49b47f74ef186747e3e31ee9f7df3955d
parent23d23385b3e4e1d05e31b5b38e8aaa7f9bdd17ce (diff)
parentfec60a261d9375d1f129313bb68036fbd2a5175c (diff)
downloadgit-07efafef2bcd87b35bf8880364dd5d098058cd4e.tar.gz
Merge branch 'js/tag'
* js/tag: verify-tag: also grok CR/LFs in the tag signature
-rw-r--r--builtin-verify-tag.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-verify-tag.c b/builtin-verify-tag.c
index dfcfcd0455..cc4c55d7ee 100644
--- 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;
}