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: 2a8ad18258d3
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 402b97fa1eca
Choose a head ref
  • 2 commits
  • 4 files changed
  • 1 contributor

Commits on Jan 19, 2020

  1. nixos/version: fix case where .git is a symlink 

    Before c9214c3 and
9d396d2 if .git is symlink the version
would gracefully default to no git revision. With those changes an
exception is thrown instead.

This introduces a new function `pathIsGitRepo` that checks if
`commitIdFromGitRepo` fails without error so we don't have to
reimplement this logic again and can fail gracefully.
    @fpletz
    fpletz committed Jan 19, 2020
    Copy the full SHA
    46773a1 View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2020

  1. Merge pull request #78058 from mayflower/nixos/version-gitdir-symlink 

    nixos/version: fix case where .git is a symlink
    @fpletz
    fpletz committed Jan 24, 2020
    Copy the full SHA
    402b97f View commit details
    Browse the repository at this point in the history