on iko/ghcjs-patch-master help sign in
Fix `cleanGit` for repositories with no submodules (#304)
commit707c7b82f4ca907a5203329933f3e5d8303c4161 authorHamish Mackenzie <Hamish.Mackenzie@iohk.io> dateFri 8 Nov 2019, 17:52 (7 years ago) parent00bdfda
1 file changed+5−2
lib/clean-git.nix+5−2
lib/clean-git.nix+5−2
@@ -93,7 +93,8 @@ then
9393 else toString gitDir + "/config";
9494
9595 # We need the .gitmodules file for submoules to work.
96− gitModules = builtins.path { name = "gitmodules"; path = toString src + "/.gitmodules"; };
96+ gitModulesStr = toString src + "/.gitmodules";
97+ gitModules = builtins.path { name = "gitmodules"; path = gitModulesStr; };
9798
9899 # Make a temporary dir that looks enough like the real thing for
99100 # `git ls-files --recurse-submodules` to give us an accurate list
@@ -108,7 +109,9 @@ then
108109 mkdir -p .git-common/objects .git-common/refs
109110 cp ${commonConfig} .git-common/config
110111 echo ../.git-common > .git/commondir
111− cp ${gitModules} ./.gitmodules
112+ ${ lib.optionalString (builtins.pathExists gitModulesStr) ''
113+ cp ${gitModules} ./.gitmodules
114+ ''}
112115 ${git}/bin/git ls-files --recurse-submodules > $out
113116 '';
114117