Skip to content

Commit

Permalink
Merge #11966: clientversion: Use full commit hash for commit-based ve…
Browse files Browse the repository at this point in the history
…rsion 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
  • Loading branch information
laanwj committed Feb 13, 2018
2 parents 2dbc4a4 + a71c56a commit f4f4f51
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/clientversion.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit f4f4f51

Please sign in to comment.