Merge branch 'doc-ctest_update' into release

This commit is contained in:
Brad King 2016-06-08 10:03:41 -04:00
commit b55039ce5b
2 changed files with 9 additions and 0 deletions

View File

@ -25,3 +25,7 @@ The options are:
have otherwise printed to the console. CTest will still report
the new revision of the repository and any conflicting files
that were found.
The update always follows the version control branch currently checked
out in the source directory. See the :ref:`CTest Update Step`
documentation for more information.

View File

@ -589,6 +589,11 @@ Configuration settings to specify the version control tool include:
* `CTest Script`_ variable: :variable:`CTEST_GIT_COMMAND`
* :module:`CTest` module variable: ``GITCOMMAND``
The source tree is updated by ``git fetch`` followed by
``git reset --hard`` to the ``FETCH_HEAD``. The result is the same
as ``git pull`` except that any local moficiations are overwritten.
Use ``GITUpdateCustom`` to specify a different approach.
``GITInitSubmodules``
If set, CTest will update the repository's submodules before updating.