diff options
| author |  Christian Couder <chriscool@tuxfamily.org> | 2013-12-11 08:46:09 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-12-12 11:53:49 -0800 |
| commit | 1f7117ef7a39ff359a964e681f360f50d7a1c8f2 (patch) | |
| tree | 94ef4f49fa84e865f82985fc773fc2b97abb2fec | |
| parent | t6050: show that git cat-file --batch fails with replace objects (diff) | |
| download | tgif-1f7117ef7a39ff359a964e681f360f50d7a1c8f2.tar.xz | |
sha1_file: perform object replacement in sha1_object_info_extended()
sha1_object_info_extended() should perform object replacement
if it is needed.
The simplest way to do that is to make it call
lookup_replace_object_extended().
And now its "unsigned flags" parameter is used as it is passed
to lookup_replace_object_extended().
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | sha1_file.c | 13 | ||||
| -rwxr-xr-x | t/t6050-replace.sh | 2 |
2 files changed, 8 insertions, 7 deletions
diff --git a/sha1_file.c b/sha1_file.c index 46ed1b12c9..0ca6770bed 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -2519,8 +2519,9 @@ int sha1_object_info_extended(const unsigned char *sha1, struct object_info *oi, struct cached_object *co; struct pack_entry e; int rtype; + const unsigned char *real = lookup_replace_object_extended(sha1, flags); - co = find_cached_object(sha1); + co = find_cached_object(real); if (co) { if (oi->typep) *(oi->typep) = co->type; @@ -2532,23 +2533,23 @@ int sha1_object_info_extended(const unsigned char *sha1, struct object_info *oi, return 0; } - if (!find_pack_entry(sha1, &e)) { + if (!find_pack_entry(real, &e)) { /* Most likely it's a loose object. */ - if (!sha1_loose_object_info(sha1, oi)) { + if (!sha1_loose_object_info(real, oi)) { oi->whence = OI_LOOSE; return 0; } /* Not a loose object; someone else may have just packed it. */ reprepare_packed_git(); - if (!find_pack_entry(sha1, &e)) + if (!find_pack_entry(real, &e)) return -1; } rtype = packed_object_info(e.p, e.offset, oi); if (rtype < 0) { - mark_bad_packed_object(e.p, sha1); - return sha1_object_info_extended(sha1, oi, 0); + mark_bad_packed_object(e.p, real); + return sha1_object_info_extended(real, oi, 0); } else if (in_delta_base_cache(e.p, e.offset)) { oi->whence = OI_DBCACHED; } else { diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh index b90dbdcd2b..bb785ec1ca 100755 --- a/t/t6050-replace.sh +++ b/t/t6050-replace.sh @@ -276,7 +276,7 @@ test_expect_success '-f option bypasses the type check' ' git replace -f HEAD^ $BLOB ' -test_expect_failure 'git cat-file --batch works on replace objects' ' +test_expect_success 'git cat-file --batch works on replace objects' ' git replace | grep $PARA3 && echo $PARA3 | git cat-file --batch ' |