diff options
| -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) |