diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2020-08-17 11:00:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-17 11:00:24 +0200 |
| commit | e849b198720c60c186c8f9486c43c495ad436e1b (patch) | |
| tree | da257464b36a733f97e6a7f8ce7867ac0dd617d8 /src/libfetchers | |
| parent | 847a5392f44f877b3f6af8370784694bf8284070 (diff) | |
| parent | ed026f7206a3154ce11bddac2e58541327313f6f (diff) | |
Merge pull request #3932 from chkno/no-show-signature
Don't try to parse signature check as commit timestamp
Diffstat (limited to 'src/libfetchers')
| -rw-r--r-- | src/libfetchers/git.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libfetchers/git.cc b/src/libfetchers/git.cc index 8b6e047f1..5ca0f8521 100644 --- a/src/libfetchers/git.cc +++ b/src/libfetchers/git.cc @@ -269,7 +269,7 @@ struct GitInputScheme : InputScheme // modified dirty file? input.attrs.insert_or_assign( "lastModified", - haveCommits ? std::stoull(runProgram("git", true, { "-C", actualUrl, "log", "-1", "--format=%ct", "HEAD" })) : 0); + haveCommits ? std::stoull(runProgram("git", true, { "-C", actualUrl, "log", "-1", "--format=%ct", "--no-show-signature", "HEAD" })) : 0); return { Tree(store->printStorePath(storePath), std::move(storePath)), @@ -421,7 +421,7 @@ struct GitInputScheme : InputScheme auto storePath = store->addToStore(name, tmpDir, FileIngestionMethod::Recursive, htSHA256, filter); - auto lastModified = std::stoull(runProgram("git", true, { "-C", repoDir, "log", "-1", "--format=%ct", input.getRev()->gitRev() })); + auto lastModified = std::stoull(runProgram("git", true, { "-C", repoDir, "log", "-1", "--format=%ct", "--no-show-signature", input.getRev()->gitRev() })); Attrs infoAttrs({ {"rev", input.getRev()->gitRev()}, |