From: Stefan Beller <sbeller@google.com>
To: Andreas Krey <a.krey@gmx.de>
Cc: git <git@vger.kernel.org>
Subject: Re: git submodule update - reset instead of checkout?
Date: Mon, 26 Mar 2018 23:33:13 +0000 [thread overview]
Message-ID: <CAGZ79kZ16+ZtcXx45nvcOeT0wSM7TEi8iDoxB6An91d-FanZhg@mail.gmail.com> (raw)
In-Reply-To: <20180309150719.GA30596@inner.h.apk.li>
On Fri, Mar 9, 2018 at 7:07 AM Andreas Krey <a.krey@gmx.de> wrote:
> Hi everyone,
> I've been reading up on the current state of git submodules
> (our customer's customers want to use them, causing a slight
> groan from our customer).
> The usability thing I wonder about - with git submodule update,
> is it necessary to detach the head to the current (or upstream)
> head, instead of resetting the current branch to that state?
Try "git checkout --recurse-submodules" or
"git reset --recurse-submodules" (there is also the
submodule.recurse option in case you don't want to type
the option all the time)
> Primary interest in the question: Seeing 'detached head' scares
> almost everybody. To brainstorm:
I agree on that. That is what we are trying to work out
eventually, too.
One idea is to "reattach the submodule branch if it fits"
another idea would be a submodule ref store that is
(partially) tied to the superproject, such that the HEAD
of the submodule is non-existent for most of the time.
https://public-inbox.org/git/cover.1512168087.git.jonathantanmy@google.com/
> - as we can already use 'submodule update --remote' to update
> to the remote head of a branch, it would be logical to have
> that branch checked out locally (and unfortunately, potentially
> have that branch's name conflict with the remote branch setup).
> - when developers more or less accidentally commit on the detached
> head, all is not lost yet (I remember this being differently),
> but if the next 'submodule update' just resets again, the commit
> just made is still dropped, just as in the detached head state.
> - So, we'd need to have 'submodule update' act closer to the pull or
> rebase counterparts and refuse to just lose commits (or uncommitted
> changes).
> Having a checked-out branch in the submodule would have the advantage
> that I can 'just' push local commits. At the moment, doing that requires
> a relatively intricate dance, not at all similar to working in the
> base (parent) module.
> I'm working on hooks that automatically update the submodules after
> a commit change (merge, pull, checkout) in the parent module, but
> with the additional feature of (a) keeping a branch checked out
> and (b) avoid discarding local changes. Probably means I shouldn't
> invoke 'submodule update' at all, and deal with everyting myself.
> Any thoughs/comments/helpful hints?
Our plan is to deprecate "git submodule" just like "git remote" is not
a well known tool any more. (e.g. Instead of git remote update, use
git fetch, that learned about updating the remote tracking branches
on its own)
> (Addional complexity: egit/jgit is in use as well, and the work model
> we will arrive at probabaly needs to work with the current egit.)
That sounds familiar, we also have JGit/Gerrit in the setup.
Stefan
prev parent reply other threads:[~2018-03-26 23:33 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-09 15:07 git submodule update - reset instead of checkout? Andreas Krey
2018-03-26 23:33 ` Stefan Beller [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=CAGZ79kZ16+ZtcXx45nvcOeT0wSM7TEi8iDoxB6An91d-FanZhg@mail.gmail.com \
--to=sbeller@google.com \
--cc=a.krey@gmx.de \
--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).