clone: more forcefully clean clones of untracked files and empty dirs#650
Merged
cole-h merged 1 commit intoNixOS:releasedfrom Sep 14, 2023
Conversation
12 tasks
cole-h
approved these changes
Sep 14, 2023
Member
cole-h
left a comment
cole-h
left a comment
There was a problem hiding this comment.
I'll get this deployed tomorrow.
lilyinstarlight
deleted the
fix/clone-clean-untracked-files-empty-dirs
branch
Member
|
(Deployed.) |
|
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: |
13 tasks
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
This should fix the erroneous error at https://logs.ofborg.org/?attempt_id=6c11441a-6d97-47a2-968b-57581683ef63&key=nixos%2Fnixpkgs.252154
Basically on darwin with a case-insensitive filesystem, when checking out from commit NixOS/nixpkgs@17532e1 on PR NixOS/nixpkgs#252154 (which has a case clash) and then trying to later do a clean checkout, git leaves an empty directory behind due to the clash
When the nixpkgs tree was then later evaluated after NixOS/nixpkgs@f87dc39 (which removed the case clash), the empty directory was still there in the local clone which got copied to the nix store and the build then failed due to spurious files/directories