@matheusbsbs / matheus-bagliano / commits / ca79c98572

sha1_file: make packed_object_info public

Some code may have a pack/offset pair for an object, but would like to look up more information. Using sha1_object_info() is too heavy-weight; it starts from the sha1 and has to find the pack again (so not only does it waste time, it might not even find the same instance). In some cases, this problem is solved by helpers like get_size_from_delta(), which is used by pack-objects to take a shortcut for objects whose packed representation has already been found. But there's no similar function for getting the object type, for instance. Rather than introduce one, let's just make the whole packed_object_info() available. It is smart enough to spend effort only on the items the caller wants. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jeff King committed Aug 11, 2016 at 05:25 UTC ca79c985727653656443da8d92c9f5c2b4da93ed

2 files changed +3 -2

cache.h

@@ -1550,6 +1550,7 @@ struct object_info {

1550 #define OBJECT_INFO_INIT {NULL}

1551

1552 extern int sha1_object_info_extended(const unsigned char *, struct object_info *, unsigned flags);

1553 +extern int packed_object_info(struct packed_git *pack, off_t offset, struct object_info *);

1554

1555 /* Dumb servers support */

1556 extern int update_server_info(int);

sha1_file.c

+2 -2

@@ -1970,8 +1970,8 @@ unwind:

1970 goto out;

1971 }

1972

1973 -static int packed_object_info(struct packed_git *p, off_t obj_offset,

1974 - struct object_info *oi)

1973 +int packed_object_info(struct packed_git *p, off_t obj_offset,

1974 + struct object_info *oi)

1975 {

1976 struct pack_window *w_curs = NULL;

1977 unsigned long size;