summaryrefslogtreecommitdiffstats
path: root/Tests/CTestUpdateGIT.sh.in
Commit message (Collapse)AuthorAgeFilesLines
* ctest_update: Support Git upstream branch rewritesBrad King2010-06-081-1/+1
| | | | | | | | | | | | | Use 'git fetch' followed by 'git reset' to update the source tree. This is better than 'git pull' because it can handle a rewritten upstream branch and does not leave local modifications. After fetch, parse FETCH_HEAD to find the merge head that 'git pull' would choose to track the upstream branch. Then reset to the selected head. In the normal fast-forward case the behavior remains unchanged. However, now local modifications and commits will be erased, and upstream rewrites are handled smoothly. This ensures that the upstream branch is tested as expected.
* Teach CTest.UpdateGIT test to fake file timestampBrad King2010-02-091-0/+6
We wrap the git executable in a shell script that touches one source file after 'git pull'. This makes the file newer than the index even though it has not actually changed. If CTest does not refresh the index properly then the test will fail with a bogus modified file.