Merge branch 'js/tag'

gitster · gitster · commit 07efafef2bcd · 2007-09-14T22:37:55.000-07:00
* js/tag:
  verify-tag: also grok CR/LFs in the tag signature
diff --git 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;
 	}

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ static int run_gpg_verify(const char *buf, unsigned long size, int verbose)`
`35`	`35`
`36`	`36`	`/* find the length without signature */`
`37`	`37`	`len = 0;`
`38`		`- while (len < size && prefixcmp(buf + len, PGP_SIGNATURE "\n")) {`
	`38`	`+ while (len < size && prefixcmp(buf + len, PGP_SIGNATURE)) {`
`39`	`39`	`eol = memchr(buf + len, '\n', size - len);`
`40`	`40`	`len += eol ? eol - (buf + len) + 1 : size - len;`
`41`	`41`	`}`