From: Michael J Gruber <git@drmicha.warpmail.net>
To: git@vger.kernel.org
Cc: Stephan Hugel <urschrei@gmail.com>, Junio C Hamano <gitster@pobox.com>
Subject: [PATCH 3/5] tag: factor out sig detection for body edits
Date: Sat, 6 Nov 2010 12:04:08 +0100 [thread overview]
Message-ID: <2d5bee89df29aeedefeadb73a26633ffe1af9a67.1289041051.git.git@drmicha.warpmail.net> (raw)
In-Reply-To: <4CAB90EC.1080302@drmicha.warpmail.net>
In-Reply-To: <cover.1289041051.git.git@drmicha.warpmail.net>
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>
---
builtin/tag.c | 12 ++----------
1 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/builtin/tag.c b/builtin/tag.c
index d311491..66feeb0 100644
--- a/builtin/tag.c
+++ b/builtin/tag.c
@@ -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)
{
@@ -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);
}
--
1.7.3.2.193.g78bbb
next prev parent reply other threads:[~2010-11-06 11:10 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-04 22:13 Error when verifying tags signed using 1.7.3.1 Stephan Hugel
2010-10-04 22:51 ` Daniel Johnson
2010-10-04 23:04 ` Stephan Hugel
2010-10-04 23:59 ` Daniel Johnson
2010-10-05 0:17 ` Stephan Hugel
2010-10-05 8:00 ` Michael J Gruber
2010-10-05 13:28 ` Stephan Hugel
2010-10-05 15:07 ` Michael J Gruber
2010-10-05 15:19 ` Stephan Hugel
2010-10-05 15:39 ` Michael J Gruber
2010-10-05 15:40 ` [PATCH] tag,verify-tag: do not trip over rfc1991 signatures Michael J Gruber
2010-10-05 20:28 ` Junio C Hamano
2010-10-05 20:42 ` Michael J Gruber
2010-10-05 20:51 ` Stephan Hugel
2010-10-05 20:56 ` Michael J Gruber
2010-11-06 11:04 ` [PATCH 0/5] Handling of " Michael J Gruber
2010-11-06 11:04 ` [PATCH 1/5] t/t7004-tag: test handling " Michael J Gruber
2010-11-09 17:17 ` Junio C Hamano
2010-11-09 17:23 ` Michael J Gruber
2010-11-10 0:19 ` Junio C Hamano
2010-11-10 8:23 ` Michael J Gruber
2010-11-06 11:04 ` [PATCH 2/5] verify-tag: factor out signature detection Michael J Gruber
2010-11-06 17:40 ` Thiago Farina
2010-11-06 11:04 ` Michael J Gruber [this message]
2010-11-06 11:04 ` [PATCH 4/5] tag: factor out sig detection for tag display Michael J Gruber
2010-11-06 11:04 ` [PATCH 5/5] tag: recognize rfc1991 signatures Michael J Gruber
2010-11-06 17:46 ` Thiago Farina
2010-11-08 19:27 ` Junio C Hamano
2010-11-10 11:17 ` [PATCHv2 0/5] Handling of " Michael J Gruber
2010-11-10 11:17 ` [PATCHv2 1/5] t/t7004-tag: test handling " Michael J Gruber
2010-11-10 11:17 ` [PATCHv2 2/5] verify-tag: factor out signature detection Michael J Gruber
2010-11-10 11:17 ` [PATCHv2 3/5] tag: factor out sig detection for body edits Michael J Gruber
2010-11-10 11:17 ` [PATCHv2 4/5] tag: factor out sig detection for tag display Michael J Gruber
2010-11-10 11:17 ` [PATCHv2 5/5] tag: recognize rfc1991 signatures Michael J Gruber
2010-11-10 17:41 ` [PATCHv2 0/5] Handling of " Junio C Hamano
2010-10-05 20:42 ` [PATCH] tag,verify-tag: do not trip over " Todd Zullinger
2010-10-05 20:47 ` Michael J Gruber
2010-10-05 15:45 ` Error when verifying tags signed using 1.7.3.1 Stephan Hugel
2010-10-05 9:41 ` Pat Thoyts
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2d5bee89df29aeedefeadb73a26633ffe1af9a67.1289041051.git.git@drmicha.warpmail.net \
--to=git@drmicha.warpmail.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=urschrei@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).