tag: factor out sig detection for body edits

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>

diff --git a/builtin/tag.c b/builtin/tag.c
index d311491e492787ae50aa172f51629abea53eec19..66feeb0c64c4b9986fe629af3b34e949f94bd887 100644 (file)
--- a/builtin/tag.c
+++ b/builtin/tag.c
@@ -29,8 +29,6 @@ struct tag_filter {
        struct commit_list *with_commit;
 };
 
        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)
 {
 static int show_reference(const char *refname, const unsigned char *sha1,
                          int flag, void *cb_data)
 {


@@ -242,8 +240,7 @@ static void write_tag_body(int fd, const unsigned char *sha1)
 {
        unsigned long size;
        enum object_type type;
 {
        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)
 
        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 */
                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);
 }
 
        free(buf);
 }