kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ExternalProject: Use "git stash save --all" only if supported (#15722) 

The --all option for git-stash wasn't introduced until git version 1.7.6.
This commit is contained in:
Daniele E. Domenichelli 2015-09-17 11:41:07 +02:00
parent b04c38159e
commit 7c5b6ed5c8
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Help/release/dev/ExternalProject_stash_save_all.rst Normal file
View File

@ -0,0 +1,5 @@
ExternalProject_stash_save_all
------------------------------
* Use "git stash save --all" only if supported. The --all option for git-stash
wasn't introduced until git version 1.7.6.

7
Modules/ExternalProject.cmake
View File

@ -646,6 +646,11 @@ endfunction()
function(_ep_write_gitupdate_script script_filename git_EXECUTABLE git_tag git_submodules git_repository work_dir) function(_ep_write_gitupdate_script script_filename git_EXECUTABLE git_tag git_submodules git_repository work_dir)
if(NOT GIT_VERSION_STRING VERSION_LESS 1.7.6)
set(git_stash_save_options --all --quiet)
else()
set(git_stash_save_options --quiet)
endif()
file(WRITE ${script_filename} file(WRITE ${script_filename}
"if(\"${git_tag}\" STREQUAL \"\") "if(\"${git_tag}\" STREQUAL \"\")
message(FATAL_ERROR \"Tag for git checkout should not be empty.\") message(FATAL_ERROR \"Tag for git checkout should not be empty.\")
@ -724,7 +729,7 @@ if(error_code OR is_remote_ref OR NOT (\"\${tag_sha}\" STREQUAL \"\${head_sha}\"
# perform git pull --rebase # perform git pull --rebase
if(need_stash) if(need_stash)
execute_process( execute_process(
COMMAND \"${git_EXECUTABLE}\" stash save --all --quiet COMMAND \"${git_EXECUTABLE}\" stash save ${git_stash_save_options}
WORKING_DIRECTORY \"${work_dir}\" WORKING_DIRECTORY \"${work_dir}\"
RESULT_VARIABLE error_code RESULT_VARIABLE error_code
) )