From 9d396d2e426b9a765de0b8999aa214f1259633e6 Mon Sep 17 00:00:00 2001 From: elseym Date: Tue, 14 Jan 2020 21:08:38 +0100 Subject: [PATCH] lib.commitIdFromGitRepo: fix support for git-submodule Adds handling for relative references from .git-files, fixing a bug introduced by c9214c394b248e1f26e45dbe1be2bd82363af3a6. --- lib/sources.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/sources.nix b/lib/sources.nix index 0fd172c42b7..a5765c0fda5 100644 --- a/lib/sources.nix +++ b/lib/sources.nix @@ -113,6 +113,10 @@ rec { with builtins; let fileName = toString path + "/" + file; packedRefsName = toString path + "/packed-refs"; + absolutePath = base: path: + if lib.hasPrefix "/" path + then path + else toString (/. + "${base}/${path}"); in if pathIsRegularFile path # Resolve git worktrees. See gitrepository-layout(5) then @@ -120,13 +124,11 @@ rec { in if m == null then throw ("File contains no gitdir reference: " + path) else - let gitDir = lib.head m; + let gitDir = absolutePath (dirOf path) (lib.head m); commonDir' = if pathIsRegularFile "${gitDir}/commondir" then lib.fileContents "${gitDir}/commondir" else gitDir; - commonDir = if lib.hasPrefix "/" commonDir' - then commonDir' - else toString (/. + "${gitDir}/${commonDir'}"); + commonDir = absolutePath gitDir commonDir'; refFile = lib.removePrefix "${commonDir}/" "${gitDir}/${file}"; in readCommitFromFile refFile commonDir