On Wed, 12 Dec 2018, Stefan Beller wrote: > > But again, I must confess, that either I forgot or just do not see a > > clear use-case/demand for submodule.update config myself any longer, > ok, let's drop that patch then. ok, But I will cherish it in my memory so whenever the use case comes back to me -- I will be back too ;) > > Probably I need to try "submodules update --merge" to see what is that > > rough edge which makes it different from the potential "merge > > --recurse-submodules", or is it easy to describe? ;-) > I think the branch handling would be the difference. I'd expect > "merge --recurse-submodules" to be sensible about staying on > the branch both in the superproject and submodule, whereas > "submodule update --merge" is too much plumbing, that we'd > expect a sensible branch handling (detached HEAD is just fine, > right?) re "detached HEAD is just fine" -- I guess "it depends"... E.g. why should it get detached if it was not detached to start with? Why not just to perform a regular "git merge --recurse-submodules" within the submodule thus making it all consistent across? If there is a need in detached HEADs handling of merges etc, get them detached and then they would stay detached - no surprises. > The merge result would be the same, I'd think. it better be ;) > > I wonder if may be instead of pestering you about this config one, I > > should ask about pointers on how to accomplish "revert > > --recurse-submodules" > What do you want to do in revert --recurse-submodules? > When you have "revert --recurse-submodules $COMMIT", > would that revert all submodule commits introduced in > that commit as well as the regular superproject revert? That is correct > This would require either opening multiple editors > (once per submodule and at last for the superproject) > or we'd have to do fancy snip-snapping of the user input, > e.g. providing a template like: > Revert "$title" > This reverts commit $COMMIT. > # The above is for the superproject commit > # Please enter the commit message ... > # Changes to be committed: > # ... > # --8<-- DO NOT DELETE THIS LINE > # Below is the commit for submodule $submodule: > Revert $submodule_range > This reverts commits $maybe_many > # The above is for the submodule commit > # Please ... > I guess it may be easier to just have multiple > editors opened sequentially to give a commit > message. yeap - that would be beautiful. Now I just need to do that all manually ;) > > or where to poke to make it possible to clone > > recursively from http://datasets.datalad.org/ where we do not place > > submodules all under the very top /.git/modules ;-) > Not sure what you mean there? sorry I was not clear... I will start a new thread for a complete description. -- Yaroslav O. Halchenko Center for Open Neuroscience http://centerforopenneuroscience.org Dartmouth College, 419 Moore Hall, Hinman Box 6207, Hanover, NH 03755 Phone: +1 (603) 646-9834 Fax: +1 (603) 646-1419 WWW: http://www.linkedin.com/in/yarik
