git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* git submodule sync / git submodule rm
@ 2015-11-11 10:18 Boettger, Heiko
  2015-11-11 20:02 ` Jens Lehmann
  0 siblings, 1 reply; 2+ messages in thread
From: Boettger, Heiko @ 2015-11-11 10:18 UTC (permalink / raw)
  To: git@vger.kernel.org

Hi,

i'm currently on a migration from svn to git and also have the task to convert the svnexternal to git submodules. During the migration step I am doing an automatic verification which needs a reliable way to switch the working tree to another branch include the submodules.
When the submodule definition changes I miss a reliable command to update the .git/config:

1. the git submodule sync seems to do nothing if a module was removed
2. git submodule update complains about the missing entry in .gitmodules
3. git submodule deinit doesn't work either and complains about missing path in .gitmodules as well

These issues are partially described in the git book under https://git-scm.com/book/en/v2/Git-Tools-Submodules in section "Issues with Submodules". Now what I am really missing is a way to keep the .git/config and references in sync with the .gitmodules file which at best is integrated into git checkout. It is clear that I could write a script for that by myself, but it would be much better to have an integrated command for that which I though is git submodule sync, but unfortunately it doesn't do a complete sync of all settings.

In the google forum there was someone asking for a git submodule remove command:

https://groups.google.com/forum/#!searchin/git-users/submodule/git-users/Md72iVvPHqw/H_j3mT7bRq4J

I don't think that it is strictly required to remove the untracked file, this can be archived by a git clean as well, but is there any progress on this.

Heiko Böttger

STORZ Endoskop Produktions GmbH
Niederlassung Schaffhausen
Schneckenackerstr. 1
8200 Schaffhausen
Switzerland

-----------------------------------------------------------------------------------------------------------------
We would be most pleased to welcome you to MEDICA 2015 in Düsseldorf,
Germany, 16th - 19th November 2015. You will find us in hall 10 booth D22.
-----------------------------------------------------------------------------------------------------------------

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: git submodule sync / git submodule rm
  2015-11-11 10:18 git submodule sync / git submodule rm Boettger, Heiko
@ 2015-11-11 20:02 ` Jens Lehmann
  0 siblings, 0 replies; 2+ messages in thread
From: Jens Lehmann @ 2015-11-11 20:02 UTC (permalink / raw)
  To: Boettger, Heiko, git@vger.kernel.org

Am 11.11.2015 um 11:18 schrieb Boettger, Heiko:
> i'm currently on a migration from svn to git and also have the task to convert the svnexternal to git submodules. During the migration step I am doing an automatic verification which needs a reliable way to switch the working tree to another branch include the submodules.
> When the submodule definition changes I miss a reliable command to update the .git/config:
>
> 1. the git submodule sync seems to do nothing if a module was removed

That's on purpose. In case you check out an older commit which still
contains the submodule in the superproject later the old config is
active again.

> 2. git submodule update complains about the missing entry in .gitmodules
> 3. git submodule deinit doesn't work either and complains about missing path in .gitmodules as well

Not sure what you are talking about here, what exactly did you do to
get into this situation? I assume you just removed the submodule entry
from .gitmodules but did not remove it from the index?

> These issues are partially described in the git book under https://git-scm.com/book/en/v2/Git-Tools-Submodules in section "Issues with Submodules". Now what I am really missing is a way to keep the .git/config and references in sync with the .gitmodules file which at best is integrated into git checkout. It is clear that I could write a script for that by myself, but it would be much better to have an integrated command for that which I though is git submodule sync, but unfortunately it doesn't do a complete sync of all settings.
>
> In the google forum there was someone asking for a git submodule remove command:
>
> https://groups.google.com/forum/#!searchin/git-users/submodule/git-users/Md72iVvPHqw/H_j3mT7bRq4J
>
> I don't think that it is strictly required to remove the untracked file, this can be archived by a git clean as well, but is there any progress on this.

Did you check "git rm <submodule>"? ;-)

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2015-11-11 20:02 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-11-11 10:18 git submodule sync / git submodule rm Boettger, Heiko
2015-11-11 20:02 ` Jens Lehmann

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 NNTP newsgroup(s).