diff --git a/git.zig b/git.zig
index 804d4e0994ab0761174b660bc00efbf34733a1b3..f3f9661c506e70a847af308e91be389f8b8cd1c9 100644
--- a/git.zig
+++ b/git.zig
@@ -112,7 +112,7 @@ pub fn getObject(alloc: std.mem.Allocator, dir: std.fs.Dir, obj: Id) !string {
         .max_output_bytes = 1024 * 1024 * 1024,
     });
     extras.assertLog(result.term == .Exited and result.term.Exited == 0, "{s}", .{result.stderr});
-    return std.mem.trimRight(u8, result.stdout, "\n");
+    return result.stdout;
 }
 
 // TODO make this inspect .git/objects manually
@@ -277,6 +277,10 @@ pub fn parseTree(alloc: std.mem.Allocator, treefile: string) !Tree {
     errdefer children.deinit();
 
     while (iter.next()) |line| {
+        if (line.len == 0) {
+            std.debug.assert(iter.peek() == null);
+            break;
+        }
         var jter = std.mem.split(u8, line, " ");
         const mode = jter.next().?;
         const otype = std.meta.stringToEnum(Tree.Object.Id.Tag, jter.next().?).?;