git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: git-submodule getting submodules from the parent repository

From
Eyvind Bernhardsen <eyvind-git@orakel.ntnu.no>
Date
Mar 31, 2008, 09:29 UTC
Message-ID
<834174D1-82F4-4438-9854-762F416BB5EF@orakel.ntnu.no>
In-Reply-To
<32541b130803301603u65d1b6b6ladac0f6200433e5f@mail.gmail.com>
On 31. mars. 2008, at 01.03, Avery Pennarun wrote:
Show 14 quoted lines
> On Sun, Mar 30, 2008 at 3:50 PM, Eyvind Bernhardsen
> <eyvind-git@orakel.ntnu.no> wrote:
>> Pushing to a branch works except that I couldn't figure out what to  
>> do
>> if the push doesn't succeed, ie, the branch has advanced on the  
>> remote
>> end.  That's a problem if more than one module references the
>> submodule or there are multiple branches in the main module.
>
> That's easy: just error out in that case.  If the current system would
> just error out when I screwed up, I'd at least be able to deal with
> it.  Right now I silently create un-check-outable parent repositories
> because I failed silently to upload my latest checkins to the child
> repository.

As I tried to explain, all the automatic push solutions I could come up with were flawed, so I decided not to use submodules at all and just have the build tool check out every module (that's what we currently do with CVS, so it's the easy way out anyway).

If I understand you correctly, you want to be forced to create a branch and push to that? I don't think that works well with many developers pushing to a shared repository (my situation), and is in any case not the "automagical push" solution that I want. I agree that it would be an improvement, but it doesn't scratch my itch :)

Show 5 quoted lines
>> True :)  I still have no idea how to figure out which submodules are
>> dirty, though.  Solving that will enable a safe "submodule update",
>> which I think is more important than "submodule push".
>
> What is unsafe about "submodule update"?

If you have local changes committed in a submodule that is updated by a pull in the main module, "submodule update" will silently overwrite them. I was wrong, though, because you can fix that just by making "submodule update" error out when a submodule doesn't have its HEAD where the main module thinks it should be.

-- 
Eyvind Bernhardsen
Previous: Avery PennarunNext: Avery Pennarun
Message 9 of 20 in “git-submodule getting submodules from the parent repository”
  1. Avery PennarunMar 29, 2008
  2. Sam VilainMar 29, 2008
  3. Eyvind BernhardsenMar 30, 2008
  4. Sam VilainMar 30, 2008
  5. Eyvind BernhardsenMar 30, 2008
  6. Sam VilainMar 30, 2008
  7. Eyvind BernhardsenMar 31, 2008
  8. Avery PennarunMar 30, 2008
  9. Eyvind BernhardsenMar 31, 2008
  10. Avery PennarunMar 31, 2008
  11. Sam VilainApr 1, 2008
  12. Avery PennarunApr 1, 2008
  13. Junio C HamanoApr 2, 2008
  14. Avery PennarunApr 2, 2008
  15. Sam VilainApr 2, 2008
  16. Junio C HamanoApr 2, 2008
  17. Avery PennarunMar 30, 2008
  18. Sam VilainApr 1, 2008
  19. Johannes SixtMar 31, 2008
  20. Avery PennarunMar 31, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.