mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'mg/maint-tag-rfc1991'

Browse Source 
* mg/maint-tag-rfc1991:
  tag: recognize rfc1991 signatures
  tag: factor out sig detection for tag display
  tag: factor out sig detection for body edits
  verify-tag: factor out signature detection
  t/t7004-tag: test handling of rfc1991 signatures
This commit is contained in:
Junio C Hamano
2010-12-08 11:24:13 -08:00
parent 657072f3ac 3d5854e765
commit a5066a0b07
5 changed files with 88 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
builtin/verify-tag.c
View File

@ -17,13 +17,11 @@ static const char * const verify_tag_usage[] = {
NULL
};
#define PGP_SIGNATURE "-----BEGIN PGP SIGNATURE-----"
static int run_gpg_verify(const char *buf, unsigned long size, int verbose)
{
struct child_process gpg;
const char *args_gpg[] = {"gpg", "--verify", "FILE", "-", NULL};
char path[PATH_MAX], *eol;
char path[PATH_MAX];
size_t len;
int fd, ret;
@ -37,11 +35,7 @@ static int run_gpg_verify(const char *buf, unsigned long size, int verbose)
close(fd);
/* find the length without signature */
len = 0;
while (len < size && prefixcmp(buf + len, PGP_SIGNATURE)) {
eol = memchr(buf + len, '\n', size - len);
len += eol ? eol - (buf + len) + 1 : size - len;
}
len = parse_signature(buf, size);
if (verbose)
write_in_full(1, buf, len);