| ... | ... | @@ -517,8 +517,8 @@ pub fn parseTreeDiff(alloc: std.mem.Allocator, input: string) !TreeDiff { |
| 517 | 517 | const before_mode = try parseTreeMode(jter.next().?); |
| 518 | 518 | const after_mode = try parseTreeMode(jter.next().?); |
| 519 | 519 | |
| 520 | | const before_tree = ensureObjId(TreeId, jter.next().?); |
| 521 | | const after_tree = ensureObjId(TreeId, jter.next().?); |
| 520 | const before_tree = ensureObjId(BlobId, jter.next().?); |
| 521 | const after_tree = ensureObjId(BlobId, jter.next().?); |
| 522 | 522 | |
| 523 | 523 | var kter = std.mem.splitScalar(u8, jter.next().?, '\t'); // why is there a tab here git. why? |
| 524 | 524 | const action_s = kter.next().?; |
| ... | ... | @@ -526,11 +526,11 @@ pub fn parseTreeDiff(alloc: std.mem.Allocator, input: string) !TreeDiff { |
| 526 | 526 | try overview.append(.{ |
| 527 | 527 | .before = .{ |
| 528 | 528 | .mode = before_mode, |
| 529 | | .tree = before_tree, |
| 529 | .blob = before_tree, |
| 530 | 530 | }, |
| 531 | 531 | .after = .{ |
| 532 | 532 | .mode = after_mode, |
| 533 | | .tree = after_tree, |
| 533 | .blob = after_tree, |
| 534 | 534 | }, |
| 535 | 535 | .action = std.meta.stringToEnum(TreeDiff.Action, action_s).?, |
| 536 | 536 | .sub_path = kter.rest(), |
| ... | ... | @@ -642,7 +642,7 @@ pub const TreeDiff = struct { |
| 642 | 642 | |
| 643 | 643 | pub const State = struct { |
| 644 | 644 | mode: Tree.Object.Mode, |
| 645 | | tree: TreeId, |
| 645 | blob: BlobId, |
| 646 | 646 | }; |
| 647 | 647 | |
| 648 | 648 | pub const Action = enum { |