From c19c852be7662588df137d5eace2ee2408f27863 Mon Sep 17 00:00:00 2001 From: Meghan Denny Date: Sat, 17 Sep 2022 13:14:00 -0700 Subject: [PATCH] util: git_rev_HEAD: fix behavior when HEAD is not a ref --- src/util/funcs.zig | 1 + 1 file changed, 1 insertion(+) diff --git a/src/util/funcs.zig b/src/util/funcs.zig index e5104355dda6a3f452f595244133dd48df40552a..cabf0fafd103f477dcb358c74df8ae586a297083 100644 --- a/src/util/funcs.zig +++ b/src/util/funcs.zig @@ -233,6 +233,7 @@ pub fn do_hash(alloc: std.mem.Allocator, comptime algo: type, data: string) !str pub fn git_rev_HEAD(alloc: std.mem.Allocator, dir: std.fs.Dir) !string { const dirg = try dir.openDir(".git", .{}); const h = std.mem.trim(u8, try dirg.readFileAlloc(alloc, "HEAD", 50), "\n"); + if (!std.mem.startsWith(u8, h, "ref:")) return h; const r = std.mem.trim(u8, try dirg.readFileAlloc(alloc, h[5..], 50), "\n"); return r; } -- 2.54.0