From: Zac Dover Date: Wed, 12 Oct 2022 12:39:36 +0000 (+1000) Subject: doc/dev: add submodule-update link to dev guide X-Git-Tag: v17.2.6~446^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8dc09258384980018798a8bfb9c8fd23a2bc6a01;p=ceph.git doc/dev: add submodule-update link to dev guide This commit links to the procedure in install/clone-source.rst that explains how to update submodules. Signed-off-by: Zac Dover (cherry picked from commit e55c3b114be402eae94550c603cf7c028c9b64bf) --- diff --git a/doc/dev/developer_guide/basic-workflow.rst b/doc/dev/developer_guide/basic-workflow.rst index cbf2560f49fe..9d8a0221f60a 100644 --- a/doc/dev/developer_guide/basic-workflow.rst +++ b/doc/dev/developer_guide/basic-workflow.rst @@ -201,6 +201,9 @@ upstream repository: This procedure should be followed often, in order to keep your local ``main`` in sync with upstream ``main``. +If the command ``git status`` returns a line that reads "Untracked files", see +:ref:`the procedure on updating submodules `. + .. _bugfix_branch: Creating a Bugfix branch diff --git a/doc/install/clone-source.rst b/doc/install/clone-source.rst index f394366e5299..6a55a880e7fe 100644 --- a/doc/install/clone-source.rst +++ b/doc/install/clone-source.rst @@ -92,7 +92,7 @@ Updating Submodules git status - #. If your submodules are up to date + A. If your submodules are up to date If your submodules are up to date, the following console output will appear: @@ -107,7 +107,7 @@ Updating Submodules You do not need this procedure. - #. If your submodules are not up to date + B. If your submodules are not up to date If your submodules are not up to date, you will see a message that includes a list of "untracked files". The example here shows such a list, which was generated from a real situation in which the