From: Yaroslav Halchenko <yoh@onerussian.com>
To: git <git@vger.kernel.org>
Subject: Re: [PATCH] Re: [wishlist] submodule.update config
Date: Thu, 13 Dec 2018 11:50:29 -0500 [thread overview]
Message-ID: <20181213165029.GB4633@hopa.kiewit.dartmouth.edu> (raw)
In-Reply-To: <CAGZ79kaka_DTUMkGdSbYW7Vam3XSWcdqxPrzFDXZJSsQC1zHYQ@mail.gmail.com>
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
prev parent reply other threads:[~2018-12-13 16:50 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-08 15:45 [wishlist] submodule.update config Yaroslav Halchenko
2018-12-10 20:40 ` Stefan Beller
2018-12-10 22:49 ` Yaroslav Halchenko
2018-12-11 0:08 ` [PATCH] " Stefan Beller
2018-12-11 5:10 ` Yaroslav O Halchenko
2018-12-12 19:31 ` Stefan Beller
2018-12-13 16:50 ` Yaroslav Halchenko [this message]
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=20181213165029.GB4633@hopa.kiewit.dartmouth.edu \
--to=yoh@onerussian.com \
--cc=git@vger.kernel.org \
/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).