[Cmake-commits] [cmake-commits] king committed CTestUpdateGIT.cmake.in 1.2 1.3

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Tests
In directory public:/mounts/ram/cvs-serv8074/Tests

Modified Files:
	CTestUpdateGIT.cmake.in 
Log Message:
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.


Index: CTestUpdateGIT.cmake.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/CTestUpdateGIT.cmake.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** CTestUpdateGIT.cmake.in	23 Apr 2009 13:10:07 -0000	1.2
--- CTestUpdateGIT.cmake.in	1 Sep 2009 19:41:43 -0000	1.3
***************
*** 136,139 ****
--- 136,146 ----
    )
  
+ # 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)