From 292acfc7a2d4f279b380cd1544d8b3beab0fe99b Mon Sep 17 00:00:00 2001
From: Meghan Denny <hello@nektro.net>
Date: Tue, 6 Jul 2021 11:02:32 -0700
Subject: [PATCH] trim newlines on both sides of file reads of .git folder

---
 src/cmd/fetch.zig     | 2 +-
 src/util/dep_type.zig | 2 +-
 src/util/funcs.zig    | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/cmd/fetch.zig b/src/cmd/fetch.zig
index 8344e59fac3f432e02b79d41431675a0a343d276..123e36a3af0fe06ce1ab6f65ac53f1f70a8ca48d 100644
--- a/src/cmd/fetch.zig
+++ b/src/cmd/fetch.zig
@@ -119,7 +119,7 @@ fn create_lockfile(list: *std.ArrayList(u.Module), dir: []const u8) !void {
     for (list.items) |m| {
         if (m.dep) |md| {
             const mpath = try std.fs.path.join(gpa, &.{ dir, m.clean_path });
-            const version = if (md.version.len > 0) md.version else (try md.type.exact_version(mpath))[0..14];
+            const version = if (md.version.len > 0) md.version else (try md.type.exact_version(mpath));
             try wl.print("{s} {s} {s} {s}\n", .{ m.clean_path, @tagName(md.type), md.path, version });
         }
     }
diff --git a/src/util/dep_type.zig b/src/util/dep_type.zig
index 09afcba64210e79820f50cf8c1e549d7fb4a47df..7fc5524d05b8c058ecb265fdf80abf9281b7ffb6 100644
--- a/src/util/dep_type.zig
+++ b/src/util/dep_type.zig
@@ -78,7 +78,7 @@ pub const DepType = enum {
         return switch (self) {
             .local => "",
             .system_lib => "",
-            .git => try std.fmt.allocPrint(gpa, "commit-{s}", .{try u.git_rev_HEAD(gpa, mpath)}),
+            .git => try std.fmt.allocPrint(gpa, "commit-{s}", .{(try u.git_rev_HEAD(gpa, mpath))[0..7]}),
             .hg => "",
             .http => "",
         };
diff --git a/src/util/funcs.zig b/src/util/funcs.zig
index 6db7907f5a1e422560d2de960c4169e7f98c23fe..23171219976ca5bf769e796fa71b283ed248f5ad 100644
--- a/src/util/funcs.zig
+++ b/src/util/funcs.zig
@@ -255,7 +255,7 @@ pub fn git_rev_HEAD(alloc: *std.mem.Allocator, path: []const u8) ![]const u8 {
     const max = std.math.maxInt(usize);
     const dir = try std.fs.cwd().openDir(path, .{});
     const dirg = try dir.openDir(".git", .{});
-    const h = std.mem.trimRight(u8, try dirg.readFileAlloc(alloc, "HEAD", max), "\n");
-    const r = std.mem.trimRight(u8, try dirg.readFileAlloc(alloc, h[5..], max), "\n");
+    const h = std.mem.trim(u8, try dirg.readFileAlloc(alloc, "HEAD", max), "\n");
+    const r = std.mem.trim(u8, try dirg.readFileAlloc(alloc, h[5..], max), "\n");
     return r;
 }
-- 
2.54.0