Skip to content

Commit 9d5b69c

Browse files
committed
git-describe.cmake: use 8-digit git commit abbreviations
The length here was previously determined automatically, and jumped from 7 to 8 recently, breaking devel/check-release. Since Git seems to think 8 characters is better now, specify it explicitly to avoid future breakages.
1 parent 22db0e4 commit 9d5b69c

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

library/git-describe.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
execute_process(COMMAND ${GIT_EXECUTABLE} describe --tags --long
1+
execute_process(COMMAND ${GIT_EXECUTABLE} describe --tags --abbrev=8 --long
22
WORKING_DIRECTORY "${dfhack_SOURCE_DIR}"
33
OUTPUT_VARIABLE DFHACK_GIT_DESCRIPTION)
44
execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse HEAD
55
WORKING_DIRECTORY "${dfhack_SOURCE_DIR}"
66
OUTPUT_VARIABLE DFHACK_GIT_COMMIT)
7-
execute_process(COMMAND ${GIT_EXECUTABLE} describe --tags --exact-match
7+
execute_process(COMMAND ${GIT_EXECUTABLE} describe --tags --abbrev=8 --exact-match
88
WORKING_DIRECTORY "${dfhack_SOURCE_DIR}"
99
RESULT_VARIABLE DFHACK_GIT_TAGGED_RESULT
1010
OUTPUT_QUIET ERROR_QUIET)

scripts

Submodule scripts updated 1 file

0 commit comments

Comments
 (0)