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: 847a5392f44f
Choose a base ref
...
head repository: NixOS/nix
compare: e849b198720c
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Aug 14, 2020

  1. Don't try to parse signature check as commit timestamp 

    When the log.showSignature git setting is enabled, the output of
"git log" contains signature verification information in addition to the
timestamp GitInputScheme::fetch wants:

  $ git log -1 --format=%ct
  gpg: Signature made Sat 07 Sep 2019 02:02:03 PM PDT
  gpg:                using RSA key 0123456789ABCDEF0123456789ABCDEF01234567
  gpg:                issuer "user@example.com"
  gpg: Good signature from "User <user@example.com>" [ultimate] 1567890123
  1567890123

For folks that had log.showSignature set, this caused all nix operations
on flakes to fail:

  $ nix build
  error: stoull
    @chkno
    chkno committed Aug 14, 2020
    Copy the full SHA
    ed026f7 View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2020

  1. Merge pull request #3932 from chkno/no-show-signature 

    Don't try to parse signature check as commit timestamp
    @edolstra
    edolstra committed Aug 17, 2020
    Copy the full SHA
    e849b19 View commit details
    Browse the repository at this point in the history