Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

lib.cleanSourceFilter: Filter all .git, not just directories #58815

Merged
merged 1 commit into from Apr 14, 2019

Conversation

infinisil
Copy link
Member

In the case of a worktree created with git worktree add, .git is
actually a file with contents pointing to the original repository.

This change makes cleanSourceFilter (and therefore cleanSource) ignore such .git files as well.

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

lib/sources.nix Outdated Show resolved Hide resolved
In the case of a worktree created with `git worktree add`, .git is
actually a file with contents pointing to the original repository.
@infinisil infinisil force-pushed the fix/cleanSource/git-worktree branch from e5e4488 to eb09fd5 Compare April 8, 2019 14:20
@infinisil infinisil merged commit 3c3de4b into NixOS:master Apr 14, 2019
@infinisil infinisil deleted the fix/cleanSource/git-worktree branch April 14, 2019 15:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants