Compare commits

...

5 Commits

Author SHA1 Message Date
Meghan Denny
469eb17a5e add an unshallow call for ci 2024-10-09 22:53:20 -07:00
Meghan Denny
eab7561244 separate the error message from the command 2024-10-09 22:52:25 -07:00
Meghan Denny
423394d955 remove --fork-point from GIT_MERGEBASE_COMMAND 2024-10-09 22:51:58 -07:00
Meghan Denny
165c796ae7 add --fork-point option 2024-10-03 00:27:46 -07:00
Meghan Denny
2d1237884b SetupGit.cmake: fix GIT_CHANGED_SOURCES 2024-10-03 00:00:32 -07:00

View File

@@ -11,7 +11,45 @@ if(NOT GIT_PROGRAM)
return()
endif()
set(GIT_DIFF_COMMAND ${GIT_PROGRAM} diff --no-color --name-only --diff-filter=AMCR origin/main HEAD)
set(GIT_UNSHALLOW_COMMAND ${GIT_PROGRAM} fetch --unshallow)
execute_process(
COMMAND
${GIT_UNSHALLOW_COMMAND}
WORKING_DIRECTORY
${CWD}
OUTPUT_STRIP_TRAILING_WHITESPACE
OUTPUT_VARIABLE
GIT_UNSHALLOW
ERROR_STRIP_TRAILING_WHITESPACE
ERROR_VARIABLE
GIT_UNSHALLOW_ERROR
RESULT_VARIABLE
GIT_UNSHALLOW_RESULT
)
set(GIT_MERGEBASE_COMMAND ${GIT_PROGRAM} merge-base origin/main HEAD)
execute_process(
COMMAND
${GIT_MERGEBASE_COMMAND}
WORKING_DIRECTORY
${CWD}
OUTPUT_STRIP_TRAILING_WHITESPACE
OUTPUT_VARIABLE
GIT_MERGEBASE
ERROR_STRIP_TRAILING_WHITESPACE
ERROR_VARIABLE
GIT_MERGEBASE_ERROR
RESULT_VARIABLE
GIT_MERGEBASE_RESULT
)
if(NOT GIT_MERGEBASE_RESULT EQUAL 0)
message(${WARNING} "Command failed: ${GIT_MERGEBASE_COMMAND}" "\n" ${GIT_MERGEBASE_ERROR})
return()
endif()
set(GIT_DIFF_COMMAND ${GIT_PROGRAM} diff --no-color --name-only --diff-filter=AMCR ${GIT_MERGEBASE} HEAD)
execute_process(
COMMAND
@@ -29,7 +67,7 @@ execute_process(
)
if(NOT GIT_DIFF_RESULT EQUAL 0)
message(${WARNING} "Command failed: ${GIT_DIFF_COMMAND} ${GIT_DIFF_ERROR}")
message(${WARNING} "Command failed: ${GIT_DIFF_COMMAND}" "\n" ${GIT_DIFF_ERROR})
return()
endif()