undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sha1_file: perform object replacement in sha1_object_info_extended()

Browse Source 
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>
This commit is contained in:
Christian Couder 2013-12-11 08:46:09 +01:00 committed by Junio C Hamano
parent 303c5d65c9
commit 1f7117ef7a
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sha1_file.c
View File

@ -2519,8 +2519,9 @@ int sha1_object_info_extended(const unsigned char *sha1, struct object_info *oi,
struct cached_object *co; struct cached_object *co;
struct pack_entry e; struct pack_entry e;
int rtype; 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 (co) {
if (oi->typep) if (oi->typep)
*(oi->typep) = co->type; *(oi->typep) = co->type;
@ -2532,23 +2533,23 @@ int sha1_object_info_extended(const unsigned char *sha1, struct object_info *oi,
return 0; return 0;
} }
if (!find_pack_entry(sha1, &e)) { if (!find_pack_entry(real, &e)) {
/* Most likely it's a loose object. */ /* 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; oi->whence = OI_LOOSE;
return 0; return 0;
} }
/* Not a loose object; someone else may have just packed it. */ /* Not a loose object; someone else may have just packed it. */
reprepare_packed_git(); reprepare_packed_git();
if (!find_pack_entry(sha1, &e)) if (!find_pack_entry(real, &e))
return -1; return -1;
} }
rtype = packed_object_info(e.p, e.offset, oi); rtype = packed_object_info(e.p, e.offset, oi);
if (rtype < 0) { if (rtype < 0) {
mark_bad_packed_object(e.p, sha1); mark_bad_packed_object(e.p, real);
return sha1_object_info_extended(sha1, oi, 0); return sha1_object_info_extended(real, oi, 0);
} else if (in_delta_base_cache(e.p, e.offset)) { } else if (in_delta_base_cache(e.p, e.offset)) {
oi->whence = OI_DBCACHED; oi->whence = OI_DBCACHED;
} else { } else {

2
t/t6050-replace.sh
View File

@ -276,7 +276,7 @@ test_expect_success '-f option bypasses the type check' '
git replace -f HEAD^ $BLOB 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 && git replace | grep $PARA3 &&
echo $PARA3 | git cat-file --batch echo $PARA3 | git cat-file --batch
' '