Skip to content

Commit

Permalink
tag: factor out sig detection for body edits
Browse files Browse the repository at this point in the history
Use the factored out code for sig detection when editing existing
tag bodies (tag -a -f without -m).

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Michael J Gruber authored and Junio C Hamano committed Nov 10, 2010
1 parent ac58c4c commit e10dfb6
Showing 1 changed file with 2 additions and 10 deletions.
12 changes: 2 additions & 10 deletions builtin/tag.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down Expand Up @@ -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)
Expand All @@ -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);
}
Expand Down

0 comments on commit e10dfb6

Please sign in to comment.