From 558e4d1ed64a02f53592403158e0549bbcee98f1 Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 8 Jun 2016 09:53:13 -0400 Subject: Help: Document ctest_update branch following behavior --- Help/command/ctest_update.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Help/command/ctest_update.rst b/Help/command/ctest_update.rst index 74af1f7..b205bca 100644 --- a/Help/command/ctest_update.rst +++ b/Help/command/ctest_update.rst @@ -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. -- cgit v0.12 From 1b18180ed4a808f706c4df2f03826e7e9804487b Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 8 Jun 2016 09:58:43 -0400 Subject: Help: Document CTest Git fetch-and-reset behavior --- Help/manual/ctest.1.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Help/manual/ctest.1.rst b/Help/manual/ctest.1.rst index 1179f56..e797333 100644 --- a/Help/manual/ctest.1.rst +++ b/Help/manual/ctest.1.rst @@ -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. -- cgit v0.12