Add fetchSubmodules to builtins.fetchGit #3166
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,97 @@ | ||
| source common.sh | ||
|
|
||
| set -u | ||
|
|
||
| if [[ -z $(type -p git) ]]; then | ||
| echo "Git not installed; skipping Git submodule tests" | ||
| exit 99 | ||
| fi | ||
|
|
||
| clearStore | ||
|
|
||
| rootRepo=$TEST_ROOT/gitSubmodulesRoot | ||
| subRepo=$TEST_ROOT/gitSubmodulesSub | ||
|
|
||
| rm -rf ${rootRepo} ${subRepo} $TEST_HOME/.cache/nix/gitv2 | ||
|
|
||
| initGitRepo() { | ||
| git init $1 | ||
| git -C $1 config user.email "foobar@example.com" | ||
| git -C $1 config user.name "Foobar" | ||
| } | ||
|
|
||
| addGitContent() { | ||
| echo "lorem ipsum" > $1/content | ||
| git -C $1 add content | ||
| git -C $1 commit -m "Initial commit" | ||
| } | ||
|
|
||
| initGitRepo $subRepo | ||
| addGitContent $subRepo | ||
|
|
||
| initGitRepo $rootRepo | ||
|
|
||
| git -C $rootRepo submodule init | ||
| git -C $rootRepo submodule add $subRepo sub | ||
| git -C $rootRepo add sub | ||
| git -C $rootRepo commit -m "Add submodule" | ||
|
|
||
| rev=$(git -C $rootRepo rev-parse HEAD) | ||
|
|
||
| r1=$(nix eval --raw "(builtins.fetchGit { url = file://$rootRepo; rev = \"$rev\"; }).outPath") | ||
| r2=$(nix eval --raw "(builtins.fetchGit { url = file://$rootRepo; rev = \"$rev\"; submodules = false; }).outPath") | ||
| r3=$(nix eval --raw "(builtins.fetchGit { url = file://$rootRepo; rev = \"$rev\"; submodules = true; }).outPath") | ||
|
|
||
| [[ $r1 == $r2 ]] | ||
| [[ $r2 != $r3 ]] | ||
|
|
||
| r4=$(nix eval --raw "(builtins.fetchGit { url = file://$rootRepo; ref = \"refs/heads/master\"; rev = \"$rev\"; }).outPath") | ||
| r5=$(nix eval --raw "(builtins.fetchGit { url = file://$rootRepo; ref = \"refs/heads/master\"; rev = \"$rev\"; submodules = false; }).outPath") | ||
| r6=$(nix eval --raw "(builtins.fetchGit { url = file://$rootRepo; ref = \"refs/heads/master\"; rev = \"$rev\"; submodules = true; }).outPath") | ||
| r7=$(nix eval --raw "(builtins.fetchGit { url = $rootRepo; ref = \"refs/heads/master\"; rev = \"$rev\"; submodules = true; }).outPath") | ||
| r8=$(nix eval --raw "(builtins.fetchGit { url = $rootRepo; rev = \"$rev\"; submodules = true; }).outPath") | ||
|
|
||
| [[ $r1 == $r4 ]] | ||
| [[ $r4 == $r5 ]] | ||
| [[ $r3 == $r6 ]] | ||
| [[ $r6 == $r7 ]] | ||
| [[ $r7 == $r8 ]] | ||
|
|
||
| have_submodules=$(nix eval "(builtins.fetchGit { url = $rootRepo; rev = \"$rev\"; }).submodules") | ||
| [[ $have_submodules == false ]] | ||
|
|
||
| have_submodules=$(nix eval "(builtins.fetchGit { url = $rootRepo; rev = \"$rev\"; submodules = false; }).submodules") | ||
| [[ $have_submodules == false ]] | ||
|
|
||
| have_submodules=$(nix eval "(builtins.fetchGit { url = $rootRepo; rev = \"$rev\"; submodules = true; }).submodules") | ||
| [[ $have_submodules == true ]] | ||
|
|
||
| pathWithoutSubmodules=$(nix eval --raw "(builtins.fetchGit { url = file://$rootRepo; rev = \"$rev\"; }).outPath") | ||
| pathWithSubmodules=$(nix eval --raw "(builtins.fetchGit { url = file://$rootRepo; rev = \"$rev\"; submodules = true; }).outPath") | ||
|
There was a problem hiding this comment. The test blows up if passing If using I wonder why There was a problem hiding this comment. I think this fixes it: --- a/src/libexpr/primops/fetchGit.cc
+++ b/src/libexpr/primops/fetchGit.cc
@@ -179,7 +179,7 @@ GitInfo exportGit(ref<Store> store, const std::string & uri,
runProgram("git", true, { "init", tmpDir, "--separate-git-dir", tmpGitDir });
runProgram("git", true, { "-C", tmpDir, "fetch", "--quiet", "--force",
- "--", cacheDir, fmt("%s:%s", *ref, *ref) });
+ "--", cacheDir, fmt("%s", *ref) });
runProgram("git", true, { "-C", tmpDir, "checkout", "--quiet", "FETCH_HEAD" });
runProgram("git", true, { "-C", tmpDir, "remote", "add", "origin", uri }); |
||
| pathWithSubmodulesAgain=$(nix eval --raw "(builtins.fetchGit { url = file://$rootRepo; rev = \"$rev\"; submodules = true; }).outPath") | ||
| pathWithSubmodulesAgainWithRef=$(nix eval --raw "(builtins.fetchGit { url = file://$rootRepo; ref = \"refs/heads/master\"; rev = \"$rev\"; submodules = true; }).outPath") | ||
|
|
||
| # The resulting store path cannot be the same. | ||
| [[ $pathWithoutSubmodules != $pathWithSubmodules ]] | ||
|
|
||
| # Checking out the same repo with submodules returns in the same store path. | ||
| [[ $pathWithSubmodules == $pathWithSubmodulesAgain ]] | ||
|
|
||
| # Checking out the same repo with submodules returns in the same store path. | ||
| [[ $pathWithSubmodulesAgain == $pathWithSubmodulesAgainWithRef ]] | ||
|
|
||
| # The submodules flag is actually honored. | ||
| [[ ! -e $pathWithoutSubmodules/sub/content ]] | ||
| [[ -e $pathWithSubmodules/sub/content ]] | ||
|
|
||
| [[ -e $pathWithSubmodulesAgainWithRef/sub/content ]] | ||
|
|
||
| # No .git directory or submodule reference files must be left | ||
| test "$(find "$pathWithSubmodules" -name .git)" = "" | ||
|
|
||
| # Git repos without submodules can be fetched with submodules = true. | ||
| subRev=$(git -C $subRepo rev-parse HEAD) | ||
| noSubmoduleRepoBaseline=$(nix eval --raw "(builtins.fetchGit { url = file://$subRepo; rev = \"$subRev\"; }).outPath") | ||
| noSubmoduleRepo=$(nix eval --raw "(builtins.fetchGit { url = file://$subRepo; rev = \"$subRev\"; submodules = true; }).outPath") | ||
|
|
||
blitz marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| [[ $noSubmoduleRepoBaseline == $noSubmoduleRepo ]] | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fetchSubmodules was renamed to submodules.