diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-20 03:37:21 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-20 03:37:21 (GMT) |
| commit | 61d7503da141f13bc916b36012760791761cc909 (patch) | |
| tree | 2b1cff95e16f2ed1543e4790d682e2e4996e92b7 /builtin | |
| parent | 2d220862d43b4d54f3173f67956fc5221690fb7e (diff) | |
| parent | 5bf29b950063c8fa2f3666cb6cf2ca20be61f3d1 (diff) | |
| download | git-61d7503da141f13bc916b36012760791761cc909.zip git-61d7503da141f13bc916b36012760791761cc909.tar.gz git-61d7503da141f13bc916b36012760791761cc909.tar.bz2 | |
Merge branch 'jc/replacing'
* jc/replacing:
read_sha1_file(): allow selective bypassing of replacement mechanism
inline lookup_replace_object() calls
read_sha1_file(): get rid of read_sha1_file_repl() madness
t6050: make sure we test not just commit replacement
Declare lookup_replace_object() in cache.h, not in commit.h
Conflicts:
environment.c
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/mktag.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/mktag.c b/builtin/mktag.c index 324a267..640ab64 100644 --- a/builtin/mktag.c +++ b/builtin/mktag.c @@ -23,8 +23,8 @@ static int verify_object(const unsigned char *sha1, const char *expected_type) int ret = -1; enum object_type type; unsigned long size; - const unsigned char *repl; - void *buffer = read_sha1_file_repl(sha1, &type, &size, &repl); + void *buffer = read_sha1_file(sha1, &type, &size); + const unsigned char *repl = lookup_replace_object(sha1); if (buffer) { if (type == type_from_string(expected_type)) |