diff options
Diffstat (limited to 'Tests/CTestUpdateGIT.cmake.in')
| -rw-r--r-- | Tests/CTestUpdateGIT.cmake.in | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Tests/CTestUpdateGIT.cmake.in b/Tests/CTestUpdateGIT.cmake.in index 793b987..0c01291 100644 --- a/Tests/CTestUpdateGIT.cmake.in +++ b/Tests/CTestUpdateGIT.cmake.in @@ -91,6 +91,9 @@ run_child(WORKING_DIRECTORY ${TOP}/import COMMAND ${GIT} add . ) run_child(WORKING_DIRECTORY ${TOP}/import + COMMAND ${GIT} config core.safecrlf false + ) +run_child(WORKING_DIRECTORY ${TOP}/import COMMAND ${GIT} submodule add ${MOD_REPO} module ) run_child(WORKING_DIRECTORY ${TOP}/import @@ -156,7 +159,7 @@ if(dirs_added) WORKING_DIRECTORY ${TOP}/user-source COMMAND ${GIT} add ${dirs_added} ) -endif(dirs_added) +endif() run_child( WORKING_DIRECTORY ${TOP}/user-source COMMAND ${GIT} add ${files_added} @@ -218,7 +221,7 @@ macro(rewind_source src_dir) WORKING_DIRECTORY ${TOP}/${src_dir} COMMAND ${GIT} submodule update ) -endmacro(rewind_source) +endmacro() rewind_source(user-source) # Make sure pull does not try to rebase (which does not work with |