Commit e0a0f997c9e236ecba67b9ff1e2d498d83f6b39d | lib/zig/git

author	Meghan Denny <hello@nektro.net> 2026-04-11 23:05:43 -07:00
committer	Meghan Denny <hello@nektro.net> 2026-04-11 23:05:43 -07:00
log	e0a0f997c9e236ecba67b9ff1e2d498d83f6b39d
tree	9ddc382009effcd3eceb19ed605c7dd501d994b8
parent	873eb80d6d42aa3be0ad19e695feb88e8e10236c
signature	Signed by SSH key SHA256:4hHJbtBRU58AYXwjL7fkz2fnQHdiye8x1QpTCQ0sHNw

add getPackedObject wrapper for soon ofs_delta

1 files changed, 14 insertions(+), 6 deletions(-)

git.zig+14-6

 @@ -1089,6 +1089,10 @@ pub const Repository = struct {
         // parse .pack
         std.log.warn("pack_index={d} pack_offset={d}", .{ pack_index, pack_offset });
+        return try r.getPackedObject(obj, pack_index, pack_offset);
+    }
+    fn getPackedObject(r: *Repository, maybe_obj: ?Id, pack_index: usize, pack_offset: usize) ![]const u8 {
         const pack_content = r.pack_content.values()[pack_index];
         if (!std.mem.eql(u8, pack_content[0..4], "PACK")) return error.InvalidGitPack;
         const pack_version = std.mem.readInt(u32, pack_content[4..][0..4], .big);
 @@ -1112,8 +1116,11 @@ pub const Repository = struct {
                 std.log.warn("type={s} size={d}", .{ @tagName(ty), size });
                 switch (ty) {
-                    .none, .reserved => {
+                    .none => {
-                        return null;
+                        unreachable;
+                    },
+                    .reserved => {
+                        unreachable;
                     },
                     .commit, .tree, .blob, .tag => {
                         const compressed_content = packedobj_fbs.rest()[0..size];
 @@ -1125,14 +1132,16 @@ pub const Repository = struct {
                         try list.writer().print(" {d}\x00", .{size});
                         try std.compress.flate.inflate.decompress(.zlib, bufr.anyReadable(), list.writer());
                         const content = try list.toOwnedSlice();
-                        try r.raw_object_contents.put(r.gpa, obj, content);
+                        if (maybe_obj) |obj| try r.raw_object_contents.put(r.gpa, obj, content);
                         return content;
                     },
                     .ofs_delta => {
-                        return null;
+                        std.log.debug("type={s} size={d}", .{ @tagName(ty), size });
+                        unreachable;
                     },
                     .ref_delta => {
-                        return null;
+                        std.log.debug("type={s} size={d}", .{ @tagName(ty), size });
+                        unreachable;
                     },
                 }
                 comptime unreachable;
 @@ -1142,7 +1151,6 @@ pub const Repository = struct {
             },
             else => return error.InvalidGitPack,
         }
-        return null;
     }
     pub fn getGitObject(r: *Repository, arena: std.mem.Allocator, obj: Id) !?GitObject {