diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-12-18 20:55:09 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-12-18 20:55:09 +0900 |
| commit | 00f117fafea4a43e95425c4abdb8cb58ec8e76b4 (patch) | |
| tree | a860396d3e681c5bb5af5b154752ac2062ab35e7 /packfile.c | |
| parent | c4a0c8845e2426375ad257b6c221a3a7d92ecfda (diff) | |
| parent | a650ad996db85b64643970dd7dc5920f989260a0 (diff) | |
| download | git-00f117fafea4a43e95425c4abdb8cb58ec8e76b4.tar.xz | |
Merge branch 'jc/object-read-stream-fix' into ps/read-object-info-improvements
* jc/object-read-stream-fix:
odb: do not use "blank" substitute for NULL
Diffstat (limited to 'packfile.c')
| -rw-r--r-- | packfile.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/packfile.c b/packfile.c index c88bd92619..08a0863fc3 100644 --- a/packfile.c +++ b/packfile.c @@ -2138,7 +2138,6 @@ int packfile_store_read_object_info(struct packfile_store *store, struct object_info *oi, unsigned flags UNUSED) { - static struct object_info blank_oi = OBJECT_INFO_INIT; struct pack_entry e; int rtype; @@ -2149,7 +2148,7 @@ int packfile_store_read_object_info(struct packfile_store *store, * We know that the caller doesn't actually need the * information below, so return early. */ - if (oi == &blank_oi) + if (!oi) return 0; rtype = packed_object_info(store->odb->repo, e.p, e.offset, oi); |