Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nix
base: f32a9b354dd9
Choose a base ref
...
head repository: NixOS/nix
compare: 55cefd41d633
Choose a head ref
  • 18 commits
  • 5 files changed
  • 4 contributors

Commits on Mar 29, 2020

  1. Add fetchSubmodules to builtins.fetchGit

    There are some downsides to this features:
    
     - Submodules are not cached (unlike the root repo),
     - Full checkouts are created in a temporary directory.
    blitz committed Mar 29, 2020
    Copy the full SHA
    f58604a View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    c2a24c2 View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    ea861be View commit details
    Browse the repository at this point in the history
  4. Add git submodule fixes from @bjornfor

    This fixes fetching repositories with no submodules and also cleans up
    .git files in checkouts.
    blitz committed Mar 29, 2020
    Copy the full SHA
    c8d33de View commit details
    Browse the repository at this point in the history
  5. Copy the full SHA
    c846abb View commit details
    Browse the repository at this point in the history
  6. Copy the full SHA
    435366e View commit details
    Browse the repository at this point in the history
  7. Fix typo in submodule test

    blitz committed Mar 29, 2020
    Copy the full SHA
    6c00a95 View commit details
    Browse the repository at this point in the history
  8. Link to stdc++fs

    Some platforms seem to still require linking with stdc++fs to enable
    STL std::filesystem support.
    blitz committed Mar 29, 2020
    Copy the full SHA
    cc4fe97 View commit details
    Browse the repository at this point in the history
  9. fetchGit: fix "fatal: couldn't find remote ref refs/heads/master" iss…

    …ue with submodules
    bjornfor authored and blitz committed Mar 29, 2020
    Copy the full SHA
    002a3a9 View commit details
    Browse the repository at this point in the history
  10. tests/fetchGitSubmodules: add more tests

    bjornfor authored and blitz committed Mar 29, 2020
    Copy the full SHA
    587e259 View commit details
    Browse the repository at this point in the history
  11. fetchGit: fix submodule output attribute

    Before this change it would be false for all evaluations but the first.
    Now it follows the input argument (as it should).
    bjornfor authored and blitz committed Mar 29, 2020
    Copy the full SHA
    6864ad7 View commit details
    Browse the repository at this point in the history
  12. fetchGit: add submodules attribute to the .link file

    The .link file is used as a lock, so I think we should put the
    "submodule" attribute in there since turning on submodules creates a new
    .link file path.
    bjornfor authored and blitz committed Mar 29, 2020
    Copy the full SHA
    369fffd View commit details
    Browse the repository at this point in the history
  13. tests/fetchGitSubmodules.sh: more checks

    bjornfor authored and blitz committed Mar 29, 2020
    Copy the full SHA
    be84049 View commit details
    Browse the repository at this point in the history
  14. fetchGit: checkout rev instead of latest ref

    Major bugfix for the submodules = true code path.
    
    TODO: Add tests.
    bjornfor authored and blitz committed Mar 29, 2020
    Copy the full SHA
    b306b70 View commit details
    Browse the repository at this point in the history
  15. Copy the full SHA
    cc522d0 View commit details
    Browse the repository at this point in the history
  16. fetchGit: fix submodule corner case by fetching all refs from cacheDir

    Due to fetchGit not checking if rev is an ancestor of ref (there is even
    a FIXME comment about it in the code), the cache repo might not have the
    ref even though it has the rev. This doesn't matter when submodule =
    false, but the submodule = true code blows up because it tries to fetch
    the (missing) ref from the cache repo.
    
    Fix this in the simplest way possible: fetch all refs from the local
    cache repo when submodules = true.
    
    TODO: Add tests.
    bjornfor authored and blitz committed Mar 29, 2020
    Copy the full SHA
    f686efe View commit details
    Browse the repository at this point in the history
  17. fetchGit: don't use std::filesystem to filter git repos

    Using std::filesystem means also having to link with -lstdc++fs on
    some platforms and it's hard to discover for what platforms this is
    needed. As all the functionality is already implemented as utilities,
    use those instead.
    blitz committed Mar 29, 2020
    Copy the full SHA
    40c023e View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2020

  1. Copy the full SHA
    55cefd4 View commit details
    Browse the repository at this point in the history