From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 14 Nov 2007 22:06:09 +0000 (-0800)
Subject: Merge branch 'mh/retag'
X-Git-Tag: v1.5.4-rc0~208
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ef4de8357dff57d403073572e8b260618bd03175?ds=inline;hp=-c

Merge branch 'mh/retag'

* mh/retag:
Add tests for git tag
Reuse previous annotation when overwriting a tag
---

ef4de8357dff57d403073572e8b260618bd03175
diff --combined builtin-tag.c
index 4aca3dc79b,566d123a8d..cbb0f04e85
--- a/builtin-tag.c
+++ b/builtin-tag.c
@@@ -81,16 -81,17 +81,16 @@@ static int show_reference(const char *r
  		}
  		printf("%-15s ", refname);
  
 -		sp = buf = read_sha1_file(sha1, &type, &size);
 -		if (!buf)
 +		buf = read_sha1_file(sha1, &type, &size);
 +		if (!buf || !size)
  			return 0;
 -		if (!size) {
 +
 +		/* skip header */
 +		sp = strstr(buf, "\n\n");
 +		if (!sp) {
  			free(buf);
  			return 0;
  		}
 -		/* skip header */
 -		while (sp + 1 < buf + size &&
 -				!(sp[0] == '\n' && sp[1] == '\n'))
 -			sp++;
  		/* only take up to "lines" lines, and strip the signature */
  		for (i = 0, sp += 2;
  				i < filter->lines && sp < buf + size &&
@@@ -246,9 -247,37 +246,37 @@@ static int git_tag_config(const char *v
  	return git_default_config(var, value);
  }
  
+ 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;
+ 
+ 	buf = read_sha1_file(sha1, &type, &size);
+ 	if (!buf)
+ 		return;
+ 	/* skip header */
+ 	sp = strstr(buf, "\n\n");
+ 
+ 	if (!sp || !size || type != OBJ_TAG) {
+ 		free(buf);
+ 		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);
+ 
+ 	free(buf);
+ }
+ 
  static void create_tag(const unsigned char *object, const char *tag,
  		       struct strbuf *buf, int message, int sign,
- 			   unsigned char *result)
+ 			   unsigned char *prev, unsigned char *result)
  {
  	enum object_type type;
  	char header_buf[1024];
@@@ -281,7 -310,11 +309,11 @@@
  		if (fd < 0)
  			die("could not create file '%s': %s",
  						path, strerror(errno));
- 		write_or_die(fd, tag_template, strlen(tag_template));
+ 
+ 		if (!is_null_sha1(prev))
+ 			write_tag_body(fd, prev);
+ 		else
+ 			write_or_die(fd, tag_template, strlen(tag_template));
  		close(fd);
  
  		launch_editor(path, buf);
@@@ -418,7 -451,7 +450,7 @@@ int cmd_tag(int argc, const char **argv
  		die("tag '%s' already exists", tag);
  
  	if (annotate)
- 		create_tag(object, tag, &buf, message, sign, object);
+ 		create_tag(object, tag, &buf, message, sign, prev, object);
  
  	lock = lock_any_ref_for_update(ref, prev, 0);
  	if (!lock)