On Sun, Jan 24, 2016 at 11:38 AM, Jens Lehmann <Jens.Lehmann@xxxxxx> wrote: > Disclaimer: Due to my currently very limited Git time budget I only > glanced over the recent discussion and patches. If you think I missed > something already discussed, I'd be happy being pointed to the relevant > discussion so I can catch up and avoid wasting everybody's time. > > Am 23.01.2016 um 01:31 schrieb Stefan Beller: >> >> This series introduces labels which you can attach to submodules like so: >> >> $ cat .gitmodules >> [submodule "gcc"] >> path = gcc >> url = git://... >> label = default >> label = devel >> [submodule "linux"] >> path = linux >> url = git://... >> label = default >> >> $ git submodule add --name emacs --label "editor" --label default >> git://... >> >> # If upstream has submodules properly labeled, you can make use of >> them: > > > Cool. Without having looked at the code I assume you also can label > submodules yourself in .git/config (or your global config) to override > upstream's settings (or use your own labels if .gitmodules does not > contain any)? I am not sure. I'll add a test for that in a reroll and make sure it passes. > >> $ git config --add submodule.autoInitialize "*default" >> $ git config --add submodule.autoInitialize ":name" >> $ git config --add submodule.autoInitialize "./by/path" > > > Ok. Though we might wanna call it submodule.autoUpdate, as initializing > it is only the prerequisite for automatically updating submodules. And > I believe automatically updating is the thing we're after here, right? I am not sure here, too. I would not mind an occasional "git submodule update" for whenever I want upstream to come down on my disk. However that's what I do with "git pull" in the non-submodule case, so you'd expect git pull to also run the update strategies for all submodules which are configured to autoUpdate? That makes sense to me. Though I never use "git pull" to begin with. I always use fetch and see how to go from there (merge or rebase after inspecting the code I fetched). That would mean we want to add the autoUpdate strategy to merge/rebase and the fetching of submodules to the fetch command? > > I'll try to explain why I believe we should be generous in initializing > submodules: If a submodule in one branch has a label configured to be > automatically updated and hasn't got the same label in another branch, > we still need to initialize the submodule even when we are on the latter > branch in case the user switches to the first branch, right? No. "git checkout" ought to autoInitalize the submodule in question when switching branches. I don't want to see initialized, but unused submodules around (neither empty dirs nor in the .git/config ideally)? > And the > fetch command needs to fetch submodule changes too when they happen in > a branch where this submodule is part of a label group configured to be > updated automatically, no matter what is currently found in the work > tree. Right, as said above fetch needs to fetch all the submodules as well. I wonder if it needs to fetch all submodule sha1s only or just try to get as much from the submodule as possible. > > So I'd propose to: > > *) Initialize every submodule present on clone or newly fetched when > the autoUpdate config is set. What if you clone branch A and then switch to B ? B has a submodule which was not initialized in A. I do not think initializing on clone/fetch is the right thing to do, but rather the branch switching command (checkout) shall make sure all its autoUpdate/autoInitialze submodules are setup properly, no? > > *) Automatically fetch only those submodules that are changed in > a commit where they have a label configured (in the commit's > .gitmodules or locally) that is to be checked out. Not sure I follow here. > > *) Let "git submodule update" update only those submodules that > have an autoupdate label configured. Why not update all initialized submodules? (In my imagination "all initialized submodules" are equal to "all submodules the user is interested in", i.e. when going from branch A to B, the checkout will (de-)init submodules as necessary. > > That will make switching between branches with different label > configurations work fine. Or am I missing something here? > > And we need to teach diff and status to complain about empty work > trees and missing initialization of submodules that are to be > automatically updated too. What about empty work trees? I'll add "git status" complaining about missing initialized submodules. > >> # The prefix * denotes a label as found in .gitmodules >> # : goes before names >> # path are prefixed ./ currently >> # both path and names need work > > > Question: how do I configure all submodules to be automatically > initialized without having to give them a label? "./*"? Or just > setting the option without a specific value? I'd guess ./* should do. Path wildcard patterns are not supported in this series, but I think it would be a viable way. > >> # no --init necessary, partially initializes submodules (only those >> which >> # were specified by label, name or path) >> $ git submodule update > > > Yup. Just like they will be fetched if they haven't been yet they > should be initialized if they haven't been yet but are configured > to be automatically updated. > >> # time passes, upstream may have added new submodules and we get them >> without >> # extra commands! >> $ git submodule update >> >> # The above configuration can be given to git clone directly via: >> $ git clone --init-submodule=*labelA ... > > > Ok. Expecially nice is the ability to also give names and paths to > "--init-submodule". (but maybe that option should be called > "--autoupdate-submodule" for the reasons stated above?) If I can understand the discussion above a bit further, I'd be happy to rename the option. I think we have some different opinions on when submodules are initialized (the invariant of what an initalized submodules means), and resulting from that we also have different opinions on when to do the (de-)init. > >> Why? >> ==== >> If you have lots of submodules, you probably don't need all of them at >> once, >> but you have functional units. Some submodules are absolutely required, >> some are optional and only for very specific purposes. > > > I'd rather like to see this as a special case of sparse checkout, as > this will be a submodule-specific solution to a more generic problem. That makes sense. > But as I understand configuring sparse checkout won't materialize for > quite some time, so I suspect we'll have to add labels first to make > current submodule users happy in the near future. Sparse configuration > can then re-use the infrastructure added here. > > Thanks, Stefan -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html