diff options
author | Eric Sagnes <eric.sagnes@gmail.com> | 2016-07-31 21:58:54 +0900 |
---|---|---|
committer | Eric Sagnes <eric.sagnes@gmail.com> | 2016-08-01 18:35:26 +0900 |
commit | 85d8b016600925791cbf970f69873dfac1f781cb (patch) | |
tree | 51b28920030c6117eff4787700aaee391ae3c81a /lib/sources.nix | |
parent | 56575cc0ac289d1f50358297cb72d9cd73f24630 (diff) |
lib: refactor commitIdFromGitRepo with fileContents
Diffstat (limited to 'lib/sources.nix')
-rw-r--r-- | lib/sources.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/sources.nix b/lib/sources.nix index 535b04523b572..c1ec02b9c26c6 100644 --- a/lib/sources.nix +++ b/lib/sources.nix @@ -44,12 +44,12 @@ rec { packedRefsName = toString path + "/packed-refs"; in if lib.pathExists fileName then - let fileContent = readFile fileName; + let fileContent = lib.fileContents fileName; # Sometimes git stores the commitId directly in the file but # sometimes it stores something like: «ref: refs/heads/branch-name» - matchRef = match "^ref: (.*)\n$" fileContent; + matchRef = match "^ref: (.*)$" fileContent; in if isNull matchRef - then lib.removeSuffix "\n" fileContent + then fileContent else readCommitFromFile path (lib.head matchRef) # Sometimes, the file isn't there at all and has been packed away in the # packed-refs file, so we have to grep through it: |