diff options
| author | Christian Couder <chriscool@tuxfamily.org> | 2009-01-23 10:07:26 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-05-31 17:02:59 -0700 |
| commit | cc400f50112a58471b992a54b1a05d99a8a82457 (patch) | |
| tree | d6f0e37bf8d3c05630dee2fe3b68bd0f075322bc | |
| parent | a3e826722515ec8abed8ccf29d958eb52d4be3f8 (diff) | |
| download | git-cc400f50112a58471b992a54b1a05d99a8a82457.tar.gz | |
mktag: call "check_sha1_signature" with the replacement sha1
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 <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | mktag.c | 7 | ||||
| -rwxr-xr-x | t/t6050-replace.sh | 12 |
2 files changed, 16 insertions, 3 deletions
@@ -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 index 0a585ecda7..334aed6216 100755 --- 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 |