diff options
| author | Brad King <brad.king@kitware.com> | 2013-02-28 16:52:30 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2013-02-28 16:52:30 (GMT) |
| commit | 78b81b773c428b6575ea50369a96e26fdfa586df (patch) | |
| tree | c21df3b639ae2339b83d5a86728866a7df490ea0 /Tests/CTestUpdateGIT.cmake.in | |
| parent | 42c56c824c719a640471a622f710b0b86ee02abc (diff) | |
| download | CMake-78b81b773c428b6575ea50369a96e26fdfa586df.zip CMake-78b81b773c428b6575ea50369a96e26fdfa586df.tar.gz CMake-78b81b773c428b6575ea50369a96e26fdfa586df.tar.bz2 | |
CTest: Fix ctest_update with 'HEAD' file in source tree
Add the '--' command-line separator to make the HEAD reference
unambiguous. Extend the CTest.UpdateGIT test to cover this case.
Diffstat (limited to 'Tests/CTestUpdateGIT.cmake.in')
| -rw-r--r-- | Tests/CTestUpdateGIT.cmake.in | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Tests/CTestUpdateGIT.cmake.in b/Tests/CTestUpdateGIT.cmake.in index 0c01291..f6939de 100644 --- a/Tests/CTestUpdateGIT.cmake.in +++ b/Tests/CTestUpdateGIT.cmake.in @@ -76,6 +76,8 @@ run_child(WORKING_DIRECTORY ${TOP}/module # Import initial content into the repository. message("Importing content...") create_content(import) +file(WRITE ${TOP}/import/HEAD "HEAD\n") +file(WRITE ${TOP}/import/master "master\n") # Import the content into the repository. run_child(WORKING_DIRECTORY ${TOP}/import @@ -157,19 +159,19 @@ update_content(user-source files_added files_removed dirs_added) if(dirs_added) run_child( WORKING_DIRECTORY ${TOP}/user-source - COMMAND ${GIT} add ${dirs_added} + COMMAND ${GIT} add -- ${dirs_added} ) endif() run_child( WORKING_DIRECTORY ${TOP}/user-source - COMMAND ${GIT} add ${files_added} + COMMAND ${GIT} add -- ${files_added} ) run_child( WORKING_DIRECTORY ${TOP}/user-source - COMMAND ${GIT} rm ${files_removed} + COMMAND ${GIT} rm -- ${files_removed} ) run_child(WORKING_DIRECTORY ${TOP}/user-source/module - COMMAND ${GIT} checkout master + COMMAND ${GIT} checkout master -- ) run_child( WORKING_DIRECTORY ${TOP}/user-source |