authorgravatar for hello@nektro.netMeghan Denny <hello@nektro.net> 2026-06-15 16:29:56 -07:00
committergravatar for hello@nektro.netMeghan Denny <hello@nektro.net> 2026-06-15 16:29:56 -07:00
log38a73efa769e538e3ac89c41bb315b345a88f06d
treec3f09d626ab6577aedf205bc34c83cedfc8b4b33
parentef8d303fd2efa79c645bdf221edbb1a0087271ca
signaturebadge-check Signed by SSH key SHA256:4hHJbtBRU58AYXwjL7fkz2fnQHdiye8x1QpTCQ0sHNw

re-remove the hint param from Tree.get


1 files changed, 7 insertions(+), 8 deletions(-)

git.zig+7-8
......@@ -1273,7 +1273,7 @@ pub const Repository = struct {
12731273 while (findFirstUnset(set, i)) |j| : (i += 1) {
12741274 i = j;
12751275 const k = result.keys()[i];
1276 const new = tree.get(k, base_tree.children[i].mode.type);
1276 const new = tree.get(k);
12771277 if (new == null) {
12781278 found += 1;
12791279 result.putAssumeCapacity(k, commit_id_prev);
......@@ -1432,12 +1432,12 @@ pub const Repository = struct {
14321432 continue;
14331433 },
14341434 .lt => {
1435 const after_item = after_tree.get(before.name, before.mode.type) orelse {
1435 const after_item = after_tree.get(before.name) orelse {
14361436 try D.either(e, w, p, before);
14371437 before_i += 1;
14381438 continue;
14391439 };
1440 const before_item = before_tree.get(after.name, after.mode.type) orelse {
1440 const before_item = before_tree.get(after.name) orelse {
14411441 try A.either(e, w, p, after);
14421442 after_i += 1;
14431443 continue;
......@@ -1460,12 +1460,12 @@ pub const Repository = struct {
14601460 comptime unreachable;
14611461 },
14621462 .gt => {
1463 const before_item = before_tree.get(after.name, after.mode.type) orelse {
1463 const before_item = before_tree.get(after.name) orelse {
14641464 try A.either(e, w, p, after);
14651465 after_i += 1;
14661466 continue;
14671467 };
1468 const after_item = after_tree.get(before.name, before.mode.type) orelse {
1468 const after_item = after_tree.get(before.name) orelse {
14691469 try D.either(e, w, p, before);
14701470 before_i += 1;
14711471 continue;
......@@ -1580,7 +1580,7 @@ fn traverseTo(r: *Repository, arena: std.mem.Allocator, treestart_id: TreeId, di
15801580 var iter = std.mem.splitScalar(u8, dir_path, '/');
15811581 while (iter.next()) |segment| {
15821582 const tree = try r.getTreeA(arena, id.id);
1583 const o = tree.get(segment, .directory) orelse return null;
1583 const o = tree.get(segment) orelse return null;
15841584 if (o.id != .tree) return null;
15851585 id = o.id.tree;
15861586 }
......@@ -1590,8 +1590,7 @@ fn traverseTo(r: *Repository, arena: std.mem.Allocator, treestart_id: TreeId, di
15901590pub const Tree = struct {
15911591 children: []const Object,
15921592
1593 pub fn get(self: Tree, name: string, hint: Object.Type) ?Object {
1594 _ = hint;
1593 pub fn get(self: Tree, name: string) ?Object {
15951594 // modified std.sort.binarySearch
15961595 const i = blk: {
15971596 var low: usize = 0;