diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-02-13 10:58:17 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-02-13 10:58:41 +0100 |
| commit | f4f4f51f1a940a239c9b406fe3b362bf3303cbce (patch) | |
| tree | 3274c5c77f5f819acf8c77fb8b9d2497c934c755 /src/clientversion.cpp | |
| parent | 2dbc4a4740cd2b9340e6a2f3ae6b13de40b5ee0d (diff) | |
| parent | a71c56aebbd93b25fcdbc170bd8b451e52a6b4dd (diff) | |
Merge #11966: clientversion: Use full commit hash for commit-based version descriptions
a71c56a clientversion: Use full commit hash for commit-based version descriptions (Luke Dashjr)
Pull request description:
git keeps changing the number of digits in abbreviated hashes, resulting in the GitHub archive hash changing because we include it here.
To workaround this and avoid hashes that become increasingly ambiguous later on, just include the full commit hash when building from git.
This has no effect on tagged releases.
(Cleanly mergable back to 0.10 without backport)
Tree-SHA512: b0be5391fadd16fbc9bbeffe1574a61c95931cbf6dea885d7e3cfcd3474b89e71767b1b55b4eeeeb66e4e119e78ff579cd9d206366d36928a209a31e1c1eed75
Diffstat (limited to 'src/clientversion.cpp')
| -rw-r--r-- | src/clientversion.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/clientversion.cpp b/src/clientversion.cpp index 7aa0a8d660..662fbb6e77 100644 --- a/src/clientversion.cpp +++ b/src/clientversion.cpp @@ -43,7 +43,7 @@ const std::string CLIENT_NAME("Satoshi"); //! git will put "#define GIT_ARCHIVE 1" on the next line inside archives. $Format:%n#define GIT_ARCHIVE 1$ #ifdef GIT_ARCHIVE -#define GIT_COMMIT_ID "$Format:%h$" +#define GIT_COMMIT_ID "$Format:%H$" #define GIT_COMMIT_DATE "$Format:%cD$" #endif |