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

Merge branch 'mg/maint-tag-rfc1991' into maint

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-10 16:13:03 -08:00
parent af41867169 3d5854e765
commit aa78384156
5 changed files with 88 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
builtin/tag.c
View File

@ -29,8 +29,6 @@ struct tag_filter {
struct commit_list *with_commit;
};
#define PGP_SIGNATURE "-----BEGIN PGP SIGNATURE-----"
static int show_reference(const char *refname, const unsigned char *sha1,
int flag, void *cb_data)
{
@ -70,9 +68,9 @@ static int show_reference(const char *refname, const unsigned char *sha1,
return 0;
}
/* only take up to "lines" lines, and strip the signature */
size = parse_signature(buf, size);
for (i = 0, sp += 2;
i < filter->lines && sp < buf + size &&
prefixcmp(sp, PGP_SIGNATURE "\n");
i < filter->lines && sp < buf + size;
i++) {
if (i)
printf("\n ");
@ -242,8 +240,7 @@ static void write_tag_body(int fd, const unsigned char *sha1)
{
unsigned long size;
enum object_type type;
char *buf, *sp, *eob;
size_t len;
char *buf, *sp;
buf = read_sha1_file(sha1, &type, &size);
if (!buf)
@ -256,12 +253,7 @@ static void write_tag_body(int fd, const unsigned char *sha1)
return;
}
sp += 2; /* skip the 2 LFs */
eob = strstr(sp, "\n" PGP_SIGNATURE "\n");
if (eob)
len = eob - sp;
else
len = buf + size - sp;
write_or_die(fd, sp, len);
write_or_die(fd, sp, parse_signature(sp, buf + size - sp));
free(buf);
}

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);