Re: [PATCH] submodule: correct error message for missing commits.
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jul 26, 2017, 20:30 UTC
- Message-ID
- <xmqqh8xzq6td.fsf@gitster.mtv.corp.google.com>
- In-Reply-To
- <20170726200832.28522-1-sbeller@google.com>
Stefan Beller <sbeller@google.com> writes:
Show 14 quoted lines
> 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.
This is confusing...
So are you saying that if we do "submodule init A && submodule update A" followed by "submodule deinit A", we _could_ show the difference for submodule A between two commits in the superproject, because we already have the necessary data for the submodule, but we _choose_ not to show it because the user told us explicitly that the submodule is not interesting?
That sounds like a very sensible and user-centric behaviour to me, and "not initialized" sounds like the right message to give in such a case (as opposed to "commits not present"---even the user told us they are not interesting, we may have them, so "not present" is not just incorrect but irrelevant because that is not the reason why we are not showing).
Or are you saying that even the user told us that the submodule is not interesting, if we had "init" it earlier even once, we show the difference and with a wrong label? Showing the difference sounds like a bug that is more severe than using a wrong label to me.
Puzzled.
Show 55 quoted lines
>
> 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>
> ---
>
> I came across this error message in the series for the
> object store modularisation[1], when I was trying to replace
> 'add_submodule_odb' by a custom loaded object store from a
> submodule repo object, which got me thinking on the error
> message and the true cause for it.
>
> While this could go in separately, I may carry it in that
> series, as there we'd come up with more error messages
> ("could not create submodule object store" as well as the
> "commits not present", maybe even "submodule not lookup failed")
>
> Thanks,
> Stefan
>
> [1] https://public-inbox.org/git/20170706202739.6056-1-sbeller@google.com/
>
>
> 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
> '