Skip to content

Commit 4afd58d

Browse files
authored
fix paths for worktree when sandbox is enabled (#423)
1 parent 553c2f9 commit 4afd58d

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

lib/clean-git.nix

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ then
5656
let
5757
hasIndex = builtins.pathExists (toString src + "/.git/index");
5858
isWorktree = (builtins.readDir (toString src)).".git" == "regular";
59-
59+
6060
# Identify the .git directory and filter just the files that we need.
6161
gitDir = cleanSourceWith ({
6262
filter = path: type:
@@ -94,8 +94,8 @@ then
9494
let
9595
git_content = lines (readFile (toString gitDir.origSrc + "/commondir"));
9696
first_line = head git_content;
97-
in toString gitDir.origSrc + "/" + first_line + "/config"
98-
else toString gitDir + "/config";
97+
in gitDir.origSrc + ("/" + first_line + "/config")
98+
else gitDir + "/config";
9999

100100
# We need the .gitmodules file for submoules to work.
101101
gitModulesStr = toString src + "/.gitmodules";
@@ -113,7 +113,7 @@ then
113113
lib.any (i: (lib.hasSuffix i path)) [
114114
"config" "index" "HEAD" "objects" "refs" ]);
115115
};
116-
116+
117117
# Make a temporary dir that looks enough like the real thing for
118118
# `git ls-files --recurse-submodules` to give us an accurate list
119119
# of all the files in the index.

0 commit comments

Comments
 (0)