diff options
| author | Brad King <brad.king@kitware.com> | 2009-09-01 19:41:43 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2009-09-01 19:41:43 (GMT) |
| commit | 06332c883f282ccc1b8a0f379ddf189c259ba1c2 (patch) | |
| tree | e4737a6aef3471d98a735d6898efe21de70d2b74 | |
| parent | d6e8ffa927e64670f73a27e76220ad983169e77f (diff) | |
| download | CMake-06332c883f282ccc1b8a0f379ddf189c259ba1c2.zip CMake-06332c883f282ccc1b8a0f379ddf189c259ba1c2.tar.gz CMake-06332c883f282ccc1b8a0f379ddf189c259ba1c2.tar.bz2 | |
Make CTest.UpdateGIT robust to user git config
Part of this test does "git pull" on a dirty work tree. We need to make
sure that 'branch.master.rebase' is false for the test repository.
Otherwise if it is true in the user configuration then pull will refuse
to rebase and the test will fail.
| -rw-r--r-- | Tests/CTestUpdateGIT.cmake.in | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Tests/CTestUpdateGIT.cmake.in b/Tests/CTestUpdateGIT.cmake.in index 2606254..8b10600 100644 --- a/Tests/CTestUpdateGIT.cmake.in +++ b/Tests/CTestUpdateGIT.cmake.in @@ -135,6 +135,13 @@ run_child( COMMAND ${GIT} reset --hard master~2 ) +# Make sure pull does not try to rebase (which does not work with +# modified files) even if ~/.gitconfig sets "branch.master.rebase". +run_child( + WORKING_DIRECTORY ${TOP}/user-source + COMMAND ${GIT} config branch.master.rebase false + ) + # Create a modified file. modify_content(user-source) |