kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'doc-ctest_update' 

1b18180e Help: Document CTest Git fetch-and-reset behavior
558e4d1e Help: Document ctest_update branch following behavior
This commit is contained in:
Brad King 2016-06-08 12:56:05 -04:00 committed by CMake Topic Stage
parent 5a13dc0b6e 1b18180ed4
commit 5804068c22
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Help/command/ctest_update.rst
View File

@ -25,3 +25,7 @@ The options are:
have otherwise printed to the console. CTest will still report have otherwise printed to the console. CTest will still report
the new revision of the repository and any conflicting files the new revision of the repository and any conflicting files
that were found. 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.

5
Help/manual/ctest.1.rst
View File

@ -589,6 +589,11 @@ Configuration settings to specify the version control tool include:
* `CTest Script`_ variable: :variable:`CTEST_GIT_COMMAND` * `CTest Script`_ variable: :variable:`CTEST_GIT_COMMAND`
* :module:`CTest` module variable: ``GITCOMMAND`` * :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`` ``GITInitSubmodules``
If set, CTest will update the repository's submodules before updating. If set, CTest will update the repository's submodules before updating.