diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-08-22 05:47:53 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-08-22 05:47:53 +0400 |
commit | f00ecbe42b82f3c8e6a170074f2299487026e400 (patch) | |
tree | fca98c6ac1d4cde3d5e60d296b2fcae8caf7fc6b /mktag.c | |
parent | 5e092b5bcea48c098af7000f888a2a0f16c9db77 (diff) | |
parent | 4e65b538acc97dd853e19a1692893f5fd47043e6 (diff) |
Merge branch 'cc/replace'
* cc/replace:
t6050: check pushing something based on a replaced commit
Documentation: add documentation for "git replace"
Add git-replace to .gitignore
builtin-replace: use "usage_msg_opt" to give better error messages
parse-options: add new function "usage_msg_opt"
builtin-replace: teach "git replace" to actually replace
Add new "git replace" command
environment: add global variable to disable replacement
mktag: call "check_sha1_signature" with the replacement sha1
replace_object: add a test case
object: call "check_sha1_signature" with the replacement sha1
sha1_file: add a "read_sha1_file_repl" function
replace_object: add mechanism to replace objects found in "refs/replace/"
refs: add a "for_each_replace_ref" function
Diffstat (limited to 'mktag.c')
-rw-r--r-- | mktag.c | 7 |
1 files changed, 4 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; |