On 2018-03-28 00:56, Stefan Beller wrote: > On Tue, Mar 27, 2018 at 12:55 PM Peter Oberndorfer <kumbayo84@xxxxxxxx> > wrote: Hi, as expected your patch fixed the BUG output. Thanks! >> 2) Should "git submodule deinit" work on submodules that were removed by > upstream already? > > To answer the question "Is this a submodule that upstream removed > (recently)?" > we'd have to put in some effort, essentially checking if that was ever a > submodule > (and not a directory or file). > Hmm, yeah looks a bit more complicated than I initially imagined since submodules can have a name that's different from their path. And after the rebase, the name <-> path mapping via .gitmodules is not available anymore. Naively I think it could work the following way: * Either iterate over all submodules in .git/modules/ and check their config has a worktree = "../../path" that resolves to the submodule path we want to remove. * Or check the "gitlink:" path in submodule/.git if it points to our .git/modules/ Then if .git/config contains a [submodule "name"] entry we should have a pretty good idea if this folder contains a stale submodule. > When using "git pull --recurse-submodules" the submodule ought to be removed > automatically. > > When doing a fetch && merge manually, we may want to teach merge to remove > a submodule that we have locally upon merge, too. > Yeah that would be nice :-) In my case I updated the repository via a rebase, so that would also have to be covered. > I view the git-submodule command as a bare bones plumbing helper, that we'd > want > to deprecate eventually as all other higher level commands will know how to > deal > with submodules. > > So I think we do not want to teach "git submodule deinit" to remove dormant > repositories, that were submodules removed by upstream already. > My gut feeling makes me expect the following: * It would be nice if such stale submodules showed up in "git submodule status" or "git status" Now "git submodule" shows nothing related to this stale submodule Now "git status" shows Untracked files: src/rt which is a bit confusing as the actual submodule is in src/rt/hoedown Now "Git gui" shows src/rt/hoedown as untracked git repository * There should be an easy(and safe) way for the user to deinit such a submodule if if the automatic submodule updating during a merge/rebase was not enabled or somehow failed. (Minus the problem of somebody having to actually do the work...) >> ~/src/rust/rust$ git submodule status > ... >> b87873eaceb75cf9342d5273f01ba2c020f61ca8 src/tools/lld ((null)) > >> -> strangely I get (null) for the current branch/commit in some > submodules? > > This sounds like (3). Looking into that. Sorry, what do you mean by (3)? Thanks, Greetings Peter
