From 12a2aa9ae3b958fc59f19271a4cfdd947158e4cc Mon Sep 17 00:00:00 2001 From: Meghan Denny Date: Sat, 21 Jun 2025 18:53:52 -0700 Subject: [PATCH] diff state lines are actually blob ids --- git.zig | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/git.zig b/git.zig index b117d8ac908cf5b23fe9de743ef5f46d59954cc3..ea40c0c3d05b71dc6b8d4ca82077f6bb014ab2de 100644 --- a/git.zig +++ b/git.zig @@ -517,8 +517,8 @@ pub fn parseTreeDiff(alloc: std.mem.Allocator, input: string) !TreeDiff { const before_mode = try parseTreeMode(jter.next().?); const after_mode = try parseTreeMode(jter.next().?); - const before_tree = ensureObjId(TreeId, jter.next().?); - const after_tree = ensureObjId(TreeId, jter.next().?); + const before_tree = ensureObjId(BlobId, jter.next().?); + const after_tree = ensureObjId(BlobId, jter.next().?); var kter = std.mem.splitScalar(u8, jter.next().?, '\t'); // why is there a tab here git. why? const action_s = kter.next().?; @@ -526,11 +526,11 @@ pub fn parseTreeDiff(alloc: std.mem.Allocator, input: string) !TreeDiff { try overview.append(.{ .before = .{ .mode = before_mode, - .tree = before_tree, + .blob = before_tree, }, .after = .{ .mode = after_mode, - .tree = after_tree, + .blob = after_tree, }, .action = std.meta.stringToEnum(TreeDiff.Action, action_s).?, .sub_path = kter.rest(), @@ -642,7 +642,7 @@ pub const TreeDiff = struct { pub const State = struct { mode: Tree.Object.Mode, - tree: TreeId, + blob: BlobId, }; pub const Action = enum { -- 2.54.0