Commit cc400f50 authored by Christian Couder's avatar Christian Couder Committed by Junio C Hamano

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's avatarChristian Couder <[email protected]>
Signed-off-by: default avatarJunio C Hamano <[email protected]>
parent a3e82672
...@@ -19,16 +19,17 @@ ...@@ -19,16 +19,17 @@
/* /*
* We refuse to tag something we can't verify. Just because. * 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; int ret = -1;
enum object_type type; enum object_type type;
unsigned long size; 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 (buffer) {
if (type == type_from_string(expected_type)) 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); free(buffer);
} }
return ret; return ret;
...@@ -70,6 +70,18 @@ test_expect_success 'replace the author' ' ...@@ -70,6 +70,18 @@ test_expect_success 'replace the author' '
git show $HASH2 | grep "O Thor" git show $HASH2 | grep "O Thor"
' '
cat >tag.sig <<EOF
object $HASH2
type commit
tag mytag
tagger T A Gger <> 0 +0000
test_expect_success 'tag replaced commit' '
git mktag <tag.sig >.git/refs/tags/mytag 2>message
# #
# #
test_done test_done
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment