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: f3505a789914
Choose a base ref
...
head repository: NixOS/nix
compare: 1d99c4ab25cf
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Feb 19, 2020

  1. builtins.fetchGit: Fix build when fetching a git worktree 

    Worktrees[1] are a feature of git which allow you to check out a ref in
a different directory.

While playing around with flakes I realized that git repositories in a
worktree checkout break when trying to build a flake:

```
$ git worktree add ../nixpkgs-flakes nixpkgs-flakes
$ cd ../nixpkgs-flakes
$ nix build .#hello
error: opening directory '/home/ma27/Projects/nixpkgs-flakes/.git/refs/heads': Not a directory
```

This issue has been fixed by determining with `git rev-parse --git-common-dir`
where the actual `.git` directory is.

Please note that this issue only exists on the `flakes` branch, fetching
worktree checkouts with Nix master seems to work fine.

[1] https://git-scm.com/docs/git-worktree
    @Ma27
    Ma27 committed Feb 19, 2020
    Copy the full SHA
    c169ea5 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #3229 from Ma27/flakes-fetchgit-worktree-support 

    builtins.fetchGit: Fix build when fetching a git worktree
    @edolstra
    edolstra committed Feb 19, 2020
    Copy the full SHA
    1d99c4a View commit details
    Browse the repository at this point in the history