diff options
author | David Cole <david.cole@kitware.com> | 2012-06-21 15:55:05 (GMT) |
---|---|---|
committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-06-21 15:55:05 (GMT) |
commit | 4870918c483f1d6fd75e627ed86558373962d584 (patch) | |
tree | 9e52d7677a2e679d9a6a704f712ba20db59531b1 /Tests | |
parent | e5ebb7740535a849e77ffdec0ce32d5ff0c3b69d (diff) | |
parent | 5c153c62f3780bdc4976a9d25e6b0c217170558e (diff) | |
download | CMake-4870918c483f1d6fd75e627ed86558373962d584.zip CMake-4870918c483f1d6fd75e627ed86558373962d584.tar.gz CMake-4870918c483f1d6fd75e627ed86558373962d584.tar.bz2 |
Merge topic 'CTestUpdateGit-safecrlf'
5c153c6 Make CTest.UpdateGIT robust to Git safecrlf on Windows
Diffstat (limited to 'Tests')
-rw-r--r-- | Tests/CTestUpdateGIT.cmake.in | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Tests/CTestUpdateGIT.cmake.in b/Tests/CTestUpdateGIT.cmake.in index 793b987..eb9f987 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 |