From: Christian.Zitzmann@continental-corporation.com
To: git@vger.kernel.org
Subject: Issue in switching branches with different submodules
Date: Thu, 22 Feb 2018 13:10:05 +0100 [thread overview]
Message-ID: <OF65A78D43.F69630E3-ONC125823B.0057EE88-C125823C.0042D7B0@continental-corporation.com> (raw)
Hello,
I've found an issue in git when working with submodules.
My Project is set up using hundreds of components by submodules (and
nested submodules), that are independent created in central development
groups.
Now it occurs that the structure of the submodules is changed over time.
E.g.
Project1(OldBranch)
- ComponentX/SubComp1 -> ssh://Server/ComponentX/SubComp1
- ComponentX/SubComp2 -> ssh://Server/ComponentX/SubComp2
- ComponentX/SubComp2 -> ssh://Server/ComponentX/SubComp2
Project1(Masster)
- ComponentX-> ssh://Server/ComponentX
There is both a repository for the old subcomponents, and for the new
Component on the server.
When trying to switch between the branches all git commands are failing.
It seems like most git commands are not creating the SubComponent
submodules because the .git file from the Component is not deleted
A 'git submodule sync' fails with:
fatal: Not a git repository:
D:/Project1/ComponentX/../.git/modules/ComponentX
Looking into the folders I see:
D:/Project1/.git/modules/ComponentX/SubComp1
D:/Project1/.git/modules/ComponentX/SubComp2
D:/Project1/.git/modules/ComponentX/SubComp3
D:/Project1/ComponentX/.git (file)
A 'git submodule update --init also fails with this folders
Neither a forced checkout or a hard reset is working.
Similar errors can occur when switching between branches with a different
number of components used as submodules vs. project specific content.
As a result it happens that people are working with an incosistend state
of the working directory.
My expectation would be that, when switching between branches/commits with
a git checkout --recurse-submodules the branche including all submodules
is checked out fully to exactly the state of the desired branch/commit
I.e the following usecases are an issue
- Deleted submodule
- Added submodule as replacement of local directory
- Changed remote location of submodule (One component is available from
different providers having individual repositories)
- Restructured Component (see example)
Similar issues are existing when creating the new structure to commit it,
but here the error is more obvious and people are manually deleting as
much as required to get the new submodules correctly in.
Best regards
Christian Zitzmann
P HEV E SW SF PMT
Continental Automotive GmbH
Siemensstrasse 12, 93055 Regensburg, Germany
Telefon/Phone: +49 941 790-7265
E-Mail: Christian.Zitzmann@continental-corporation.com
next reply other threads:[~2018-02-22 12:10 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-22 12:10 Christian.Zitzmann [this message]
2018-02-24 0:36 ` Issue in switching branches with different submodules Stefan Beller
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=OF65A78D43.F69630E3-ONC125823B.0057EE88-C125823C.0042D7B0@continental-corporation.com \
--to=christian.zitzmann@continental-corporation.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).