From: Jacob Keller <jacob.keller@gmail.com>
To: Stefan Beller <sbeller@google.com>
Cc: Git mailing list <git@vger.kernel.org>
Subject: Re: [PATCH] submodule: correct error message for missing commits.
Date: Tue, 26 Sep 2017 16:37:02 -0700 [thread overview]
Message-ID: <CA+P7+xr6_7BW0q7iZsMdeexFff=A-8rp8Lfds2NTXmvu1tOqCw@mail.gmail.com> (raw)
In-Reply-To: <20170926182756.13319-1-sbeller@google.com>
On Tue, Sep 26, 2017 at 11:27 AM, Stefan Beller <sbeller@google.com> wrote:
> When a submodule diff should be displayed we currently just add the
> submodule objects to the main object store and then e.g. walk the
> revision graph and create a summary for that submodule.
>
> It is possible that we are missing the submodule either completely or
> partially, which we currently differentiate with different error messages
> depending on whether (1) the whole submodule object store is missing or
> (2) just the needed for this particular diff. (1) is reported as
> "not initialized", and (2) is reported as "commits not present".
>
> If a submodule is deinit'ed its repository data is still around inside
> the superproject, such that the diff can still be produced. In that way
> the error message (1) is misleading as we can have a diff despite the
> submodule being not initialized.
>
> Downgrade the error message (1) to be the same as (2) and just say
> the commits are not present, as that is the true reason why the diff
> cannot be shown.
>
> Signed-off-by: Stefan Beller <sbeller@google.com>
This makes sense to me.
Thanks,
Jake
> ---
> submodule.c | 2 +-
> t/t4059-diff-submodule-not-initialized.sh | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/submodule.c b/submodule.c
> index 6531c5d609..280c246477 100644
> --- a/submodule.c
> +++ b/submodule.c
> @@ -567,7 +567,7 @@ static void show_submodule_header(FILE *f, const char *path,
>
> if (add_submodule_odb(path)) {
> if (!message)
> - message = "(not initialized)";
> + message = "(commits not present)";
> goto output_header;
> }
>
> diff --git a/t/t4059-diff-submodule-not-initialized.sh b/t/t4059-diff-submodule-not-initialized.sh
> index cd70fd5192..49bca7b48d 100755
> --- a/t/t4059-diff-submodule-not-initialized.sh
> +++ b/t/t4059-diff-submodule-not-initialized.sh
> @@ -95,7 +95,7 @@ test_expect_success 'submodule not initialized in new clone' '
> git clone . sm3 &&
> git -C sm3 diff-tree -p --no-commit-id --submodule=log HEAD >actual &&
> cat >expected <<-EOF &&
> - Submodule sm1 $smhead1...$smhead2 (not initialized)
> + Submodule sm1 $smhead1...$smhead2 (commits not present)
> EOF
> test_cmp expected actual
> '
> --
> 2.14.0.rc0.3.g6c2e499285
>
next prev parent reply other threads:[~2017-09-26 23:37 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-26 18:27 [PATCH] submodule: correct error message for missing commits Stefan Beller
2017-09-26 23:37 ` Jacob Keller [this message]
2017-09-27 0:52 ` Junio C Hamano
-- strict thread matches above, loose matches on Subject: below --
2017-07-26 20:08 Stefan Beller
2017-07-26 20:30 ` Junio C Hamano
2017-07-26 20:56 ` Stefan Beller
2017-07-26 21:10 ` Junio C Hamano
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CA+P7+xr6_7BW0q7iZsMdeexFff=A-8rp8Lfds2NTXmvu1tOqCw@mail.gmail.com' \
--to=jacob.keller@gmail.com \
--cc=git@vger.kernel.org \
--cc=sbeller@google.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).