authorgravatar for hello@nektro.netMeghan Denny <hello@nektro.net> 2025-01-31 13:34:52 -08:00
committergravatar for hello@nektro.netMeghan Denny <hello@nektro.net> 2025-01-31 13:34:52 -08:00
logbf1679636fde210414bed20e7565af03d4a0ed6e
treea6859ca890016a97bfb55bcbec019f44483abb31
parent586d56281aa49f8ab090830a18c7ec5cae45314b

make getObject output agree with getObjectSize

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

git.zig+5-1
...@@ -112,7 +112,7 @@ pub fn getObject(alloc: std.mem.Allocator, dir: std.fs.Dir, obj: Id) !string {...@@ -112,7 +112,7 @@ pub fn getObject(alloc: std.mem.Allocator, dir: std.fs.Dir, obj: Id) !string {
112 .max_output_bytes = 1024 * 1024 * 1024,112 .max_output_bytes = 1024 * 1024 * 1024,
113 });113 });
114 extras.assertLog(result.term == .Exited and result.term.Exited == 0, "{s}", .{result.stderr});114 extras.assertLog(result.term == .Exited and result.term.Exited == 0, "{s}", .{result.stderr});
115 return std.mem.trimRight(u8, result.stdout, "\n");115 return result.stdout;
116}116}
117117
118// TODO make this inspect .git/objects manually118// TODO make this inspect .git/objects manually
...@@ -277,6 +277,10 @@ pub fn parseTree(alloc: std.mem.Allocator, treefile: string) !Tree {...@@ -277,6 +277,10 @@ pub fn parseTree(alloc: std.mem.Allocator, treefile: string) !Tree {
277 errdefer children.deinit();277 errdefer children.deinit();
278278
279 while (iter.next()) |line| {279 while (iter.next()) |line| {
280 if (line.len == 0) {
281 std.debug.assert(iter.peek() == null);
282 break;
283 }
280 var jter = std.mem.split(u8, line, " ");284 var jter = std.mem.split(u8, line, " ");
281 const mode = jter.next().?;285 const mode = jter.next().?;
282 const otype = std.meta.stringToEnum(Tree.Object.Id.Tag, jter.next().?).?;286 const otype = std.meta.stringToEnum(Tree.Object.Id.Tag, jter.next().?).?;