git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jacob Keller <jacob.e.keller@intel.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
	Stefan Beller <stefanbeller@gmail.com>, Jeff King <peff@peff.net>,
	Johannes Sixt <j6t@kdbg.org>,
	Jacob Keller <jacob.keller@gmail.com>
Subject: [PATCH v7 5/7] submodule: correct output of submodule log format
Date: Wed, 17 Aug 2016 17:51:29 -0700	[thread overview]
Message-ID: <20160818005131.31600-6-jacob.e.keller@intel.com> (raw)
In-Reply-To: <20160818005131.31600-1-jacob.e.keller@intel.com>

From: Jacob Keller <jacob.keller@gmail.com>

The submodule log diff output incorrectly states that the submodule is
"not checked out" in cases where it wants to say the submodule is "not
initialized". Change the wording to reflect the actual check being
performed.

Signed-off-by: Jacob Keller <jacob.keller@gmail.com>
---
 submodule.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/submodule.c b/submodule.c
index 1b5cdfb7e784..e1a51b7506ff 100644
--- a/submodule.c
+++ b/submodule.c
@@ -348,7 +348,7 @@ void show_submodule_summary(FILE *f, const char *path,
 	if (is_null_sha1(two))
 		message = "(submodule deleted)";
 	else if (add_submodule_odb(path))
-		message = "(not checked out)";
+		message = "(not initialized)";
 	else if (is_null_sha1(one))
 		message = "(new submodule)";
 	else if (!(left = lookup_commit_reference(one)) ||
-- 
2.10.0.rc0.217.g609f9e8.dirty


  parent reply	other threads:[~2016-08-18  0:52 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-08-18  0:51 [PATCH v7 0/7] implement inline submodule diff format Jacob Keller
2016-08-18  0:51 ` [PATCH v7 1/7] diff.c: remove output_prefix_length field Jacob Keller
2016-08-18  0:51 ` [PATCH v7 2/7] graph: add support for --line-prefix on all graph-aware output Jacob Keller
2016-08-18 17:56   ` Stefan Beller
2016-08-18 18:26     ` Jacob Keller
2016-08-18 18:29     ` Jacob Keller
2016-08-18  0:51 ` [PATCH v7 3/7] diff: prepare for additional submodule formats Jacob Keller
2016-08-18 18:03   ` Stefan Beller
2016-08-18  0:51 ` [PATCH v7 4/7] submodule: allow do_submodule_path to work if given gitdir directly Jacob Keller
2016-08-18 18:06   ` Stefan Beller
2016-08-18 18:46   ` Junio C Hamano
2016-08-18 18:50     ` Jacob Keller
2016-08-18  0:51 ` Jacob Keller [this message]
2016-08-18 18:25   ` [PATCH v7 5/7] submodule: correct output of submodule log format Stefan Beller
2016-08-18 18:34     ` Jacob Keller
2016-08-18  0:51 ` [PATCH v7 6/7] submodule: refactor show_submodule_summary with helper function Jacob Keller
2016-08-18  7:00   ` David Aguilar
2016-08-18  7:37     ` Jacob Keller
2016-08-18 19:04   ` Stefan Beller
2016-08-18 20:24     ` Jacob Keller
2016-08-18 20:39       ` Stefan Beller
2016-08-18 20:44         ` Jacob Keller
2016-08-18 20:49           ` Junio C Hamano
2016-08-18 21:08             ` Jacob Keller
2016-08-18  0:51 ` [PATCH v7 7/7] diff: teach diff to display submodule difference with an inline diff Jacob Keller
2016-08-18 19:47   ` Stefan Beller
2016-08-18 20:13     ` Jacob Keller

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=20160818005131.31600-6-jacob.e.keller@intel.com \
    --to=jacob.e.keller@intel.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=j6t@kdbg.org \
    --cc=jacob.keller@gmail.com \
    --cc=peff@peff.net \
    --cc=stefanbeller@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).