authorgravatar for hello@nektro.netMeghan Denny <hello@nektro.net> 2022-03-06 16:20:43 -08:00
committergravatar for hello@nektro.netMeghan Denny <hello@nektro.net> 2022-03-06 16:20:43 -08:00
logbb69198a66023bf1874d6b247c0651563f5e549b
tree0ffb4f20815929bcef57348044e6258a4f156b7c
parentef2b0547870d340ff9e02360d028f00c2fb3a82d

cmd/fetch- skip lock diff item if from and to are the same

this can happen if an override changed positions but is still in the tree

1 files changed, 1 insertions(+), 0 deletions(-)

src/cmd/fetch.zig+1
...@@ -234,6 +234,7 @@ fn diff_lockfile(alloc: std.mem.Allocator) !void {...@@ -234,6 +234,7 @@ fn diff_lockfile(alloc: std.mem.Allocator) !void {
234234
235fn diff_printchange(comptime testt: string, comptime replacement: string, item: std.StringHashMap(DiffChange).Entry) bool {235fn diff_printchange(comptime testt: string, comptime replacement: string, item: std.StringHashMap(DiffChange).Entry) bool {
236 if (std.mem.startsWith(u8, item.key_ptr.*, testt)) {236 if (std.mem.startsWith(u8, item.key_ptr.*, testt)) {
237 if (std.mem.eql(u8, item.value_ptr.from, item.value_ptr.to)) return true;
237 std.debug.print(replacement, .{ item.key_ptr.*[4..], item.value_ptr.from, item.value_ptr.to });238 std.debug.print(replacement, .{ item.key_ptr.*[4..], item.value_ptr.from, item.value_ptr.to });
238 return true;239 return true;
239 }240 }