projects
/
quassel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
710bb9f
)
Explicitly disable printing signatures when running git
author
Daniel Albers
<daniel@lbe.rs>
Wed, 3 Jan 2018 00:41:41 +0000
(
01:41
+0100)
committer
Manuel Nickschas
<sputnick@quassel-irc.org>
Wed, 4 Apr 2018 21:14:04 +0000
(23:14 +0200)
Make sure version parsing doesn't fail when a signed commit is at the tip and
log.showsignature is enabled.
(cherry picked from commit
738f5436bbc9a8c761a487ae24da65fd74a62ef9
)
CMakeLists.txt
patch
|
blob
|
history
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
32060b9
..
faed218
100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-618,7
+618,7
@@
git_describe(GIT_DESCRIBE --long)
# If in a Git repo we can get the commit-date from a git command
if (GIT_HEAD)
execute_process(
- COMMAND git show -s --format=%ct
+ COMMAND git
-c log.showsignature=false
show -s --format=%ct
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
OUTPUT_VARIABLE GIT_COMMIT_DATE
OUTPUT_STRIP_TRAILING_WHITESPACE