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/nixpkgs
base: bf91434c136d
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 247c25d302f7
Choose a head ref
  • 2 commits
  • 4 files changed
  • 2 contributors

Commits on Jan 10, 2020

  1. lib.commitIdFromGitRepo: support git-worktree 

    lib.commitIdFromGitRepo now resolves the refs from the
parent repository in case the supplied path is a file
containing the path to said repository. this adds support
for git-worktree and things alike. see gitrepository-layout(5).

this also:
- adds a new boolean function lib.pathIsRegularFile to
  check whether a path is a regular file
- patches lib.revisionWithDefault and
  the revision and versionSuffix attributes in
  config.system.nixos in order to support git-worktrees
    @elseym
    elseym committed Jan 10, 2020
    Copy the full SHA
    c9214c3 View commit details
    Browse the repository at this point in the history

Commits on Jan 13, 2020

  1. Merge pull request #77473 from mayflower/worktrees 

    lib.commitIdFromGitRepo: support git-worktree
    @lheckemann
    lheckemann committed Jan 13, 2020
    Copy the full SHA
    247c25d View commit details
    Browse the repository at this point in the history