From: "Manish Goregaokar via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
Manish Goregaokar <manishsmail@gmail.com>
Subject: [PATCH 1/1] Documentation: Correct man page for the SHAs reported by 'submodule status'
Date: Fri, 22 Nov 2019 23:11:25 +0000 [thread overview]
Message-ID: <0eabb27ba0c7a07bbf24f13f1766c0ff63995348.1574464285.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.470.git.1574464285.gitgitgadget@gmail.com>
From: Manish Goregaokar <manishsmail@gmail.com>
'git submodule status' reports the SHAs expected by the parent project,
not the SHAs that are actually checked out in the submodule. Checking
out a new SHA in a submodule will not change the output of 'git
submodule status' until you 'git add' the submodule.
Signed-off-by: Manish Goregaokar <manishsmail@gmail.com>
---
Documentation/git-submodule.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt
index 0ed5c24dc1..31e089454a 100644
--- a/Documentation/git-submodule.txt
+++ b/Documentation/git-submodule.txt
@@ -72,8 +72,8 @@ git-submodule will correctly locate the submodule using the relative
URL in `.gitmodules`.
status [--cached] [--recursive] [--] [<path>...]::
- Show the status of the submodules. This will print the SHA-1 of the
- currently checked out commit for each submodule, along with the
+ Show the status of the submodules. This will print the SHA-1
+ recorded in the superproject for each submodule, along with the
submodule path and the output of 'git describe' for the
SHA-1. Each SHA-1 will possibly be prefixed with `-` if the submodule is
not initialized, `+` if the currently checked out submodule commit
--
gitgitgadget
next prev parent reply other threads:[~2019-11-22 23:11 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-22 23:11 [PATCH 0/1] doc: Correct man page for the SHAs reported by 'submodule status' Manish Goregaokar via GitGitGadget
2019-11-22 23:11 ` Manish Goregaokar via GitGitGadget [this message]
2019-11-23 1:21 ` [PATCH 1/1] Documentation: " Junio C Hamano
2019-11-23 5:46 ` Manish Goregaokar
2019-11-23 5:54 ` [PATCH v2 0/1] doc: Document 'git submodule status --cached' Manish Goregaokar via GitGitGadget
2019-11-23 5:54 ` [PATCH v2 1/1] " Manish Goregaokar via GitGitGadget
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=0eabb27ba0c7a07bbf24f13f1766c0ff63995348.1574464285.git.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=manishsmail@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).