mktag: call "check_sha1_signature" with the replacement sha1

chriscool · gitster · commit cc400f50112a · 2009-05-31T17:02:59.000-07:00
Otherwise we get a "sha1 mismatch" error for replaced objects.

Note that I am not sure at all that this is a good change.
It may be that we should just refuse to tag a replaced object. But
in this case we should probably give a meaningfull error message
instead of "sha1 mismatch".

Signed-off-by: Christian Couder &lt;chriscool@tuxfamily.org&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/mktag.c b/mktag.c
@@ -19,16 +19,17 @@
 /*
  * We refuse to tag something we can't verify. Just because.
  */
-static int verify_object(unsigned char *sha1, const char *expected_type)
+static int verify_object(const unsigned char *sha1, const char *expected_type)
 {
 	int ret = -1;
 	enum object_type type;
 	unsigned long size;
-	void *buffer = read_sha1_file(sha1, &type, &size);
+	const unsigned char *repl;
+	void *buffer = read_sha1_file_repl(sha1, &type, &size, &repl);
 
 	if (buffer) {
 		if (type == type_from_string(expected_type))
-			ret = check_sha1_signature(sha1, buffer, size, expected_type);
+			ret = check_sha1_signature(repl, buffer, size, expected_type);
 		free(buffer);
 	}
 	return ret;
diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh
@@ -70,6 +70,18 @@ test_expect_success 'replace the author' '
      git show $HASH2 | grep "O Thor"
 '
 
+cat >tag.sig <<EOF
+object $HASH2
+type commit
+tag mytag
+tagger T A Gger <> 0 +0000
+
+EOF
+
+test_expect_success 'tag replaced commit' '
+     git mktag <tag.sig >.git/refs/tags/mytag 2>message
+'
+
 #
 #
 test_done

Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,18 @@ test_expect_success 'replace the author' '`
`70`	`70`	`git show $HASH2 \| grep "O Thor"`
`71`	`71`	`'`
`72`	`72`
	`73`	`+cat >tag.sig <<EOF`
	`74`	`+object $HASH2`
	`75`	`+type commit`
	`76`	`+tag mytag`
	`77`	`+tagger T A Gger <> 0 +0000`
	`78`	`+`
	`79`	`+EOF`
	`80`	`+`
	`81`	`+test_expect_success 'tag replaced commit' '`
	`82`	`+ git mktag <tag.sig >.git/refs/tags/mytag 2>message`
	`83`	`+'`
	`84`	`+`
`73`	`85`	`#`
`74`	`86`	`#`
`75`	`87`	`test_done`