Skip to content

Commit f4f4f51

Browse files
committed
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
2 parents 2dbc4a4 + a71c56a commit f4f4f51

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/clientversion.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ const std::string CLIENT_NAME("Satoshi");
4343

4444
//! git will put "#define GIT_ARCHIVE 1" on the next line inside archives. $Format:%n#define GIT_ARCHIVE 1$
4545
#ifdef GIT_ARCHIVE
46-
#define GIT_COMMIT_ID "$Format:%h$"
46+
#define GIT_COMMIT_ID "$Format:%H$"
4747
#define GIT_COMMIT_DATE "$Format:%cD$"
4848
#endif
4949

0 commit comments

Comments
 (0)