Commit 06332c88 authored by Brad King's avatar Brad King

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.
parent d6e8ffa9
......@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment