@@ -138,12 +138,13 @@ rec {
138138 in if m == null
139139 then throw ("File contains no gitdir reference: " + path)
140140 else
141− let gitDir = absolutePath (dirOf path) (lib.head m);
142− commonDir' = if pathIsRegularFile "${gitDir}/commondir"
143− then lib.fileContents "${gitDir}/commondir"
144− else gitDir;
145− commonDir = absolutePath gitDir commonDir';
146− refFile = lib.removePrefix "${commonDir}/" "${gitDir}/${file}";
141+ let gitDir = absolutePath (dirOf path) (lib.head m);
142+ commonDir'' = if pathIsRegularFile "${gitDir}/commondir"
143+ then lib.fileContents "${gitDir}/commondir"
144+ else gitDir;
145+ commonDir' = lib.removeSuffix "/" commonDir'';
146+ commonDir = absolutePath gitDir commonDir';
147+ refFile = lib.removePrefix "${commonDir}/" "${gitDir}/${file}";
147148 in readCommitFromFile refFile commonDir
148149
149150 else if pathIsRegularFile fileName