On Wed, Jul 26, 2017 at 1:30 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > Stefan Beller <sbeller@xxxxxxxxxx> writes: > >> 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", $ git clone https://gerrit.googlesource.com/gerrit $ git show --submodule=log bb798b00bb ... Submodule plugins/replication ... (not initialized) $ git submodule update --init $ # a good example of cross repo changes: $ git show --submodule=log bb798b00bb ... Submodule plugins/replication db4aecb2b8...98b7156cee: > Stop using WorkQueue#unregisterWorkQueue. < PushOne: Remove redundant string concatenation $ git submodule deinit -f --all $ git show --submodule=log bb798b00bb ... Submodule plugins/replication db4aecb2b8...98b7156cee: > Stop using WorkQueue#unregisterWorkQueue. < PushOne: Remove redundant string concatenation $ rm -rf .git/modules/* $ git show --submodule=log bb798b00bb ... Submodule plugins/replication ... (not initialized) > 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? We _do_ show the submodule as demonstrated by the code sample above if we possess the objects. Hence the "not initialized" is not quite technically correct. (After deinit it is not initialized, but we show nevertheless, so the user perceived _reason_ why we do not show the submodule is "commits not present". > 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). So you are saying we should instead do: if (not active) message = "not initialized" if (problems with object loading) message = "commits not present" ... > 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. I looked through the man pages and they never specify if submodule activeness affects the superproject diff, so we'd want to change that so that only active submodules are diffed.
