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

Re: git submodule update --merge

From
Avery Pennarun <apenwarr@gmail.com>
Date
May 25, 2009, 19:04 UTC
Message-ID
<32541b130905251204q20b5600fr4486390cc9157f66@mail.gmail.com>
In-Reply-To
<alpine.DEB.1.00.0905252053070.4288@intel-tinevez-2-302>

On Mon, May 25, 2009 at 2:57 PM, Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:

Show 14 quoted lines
> Because in the project I use submodules most heavily, there is one
> recurring theme: you cannot push to the submodules.  And by "you" I mean
> "a regular user".
>
> So virtually all you do in these submodules cannot be pushed at all.  It
> has to be submitted to the respective submodule maintainer.
>
> And guess what happens in such a case when you set that tentative "update"
> variable to "merge"?
>
> Exactly.
>
> FWIW I consider any scenario where the average users have push access to
> the submodule a toy scenario.

I have the same problem. Out of curiosity, how do you handle the case where you really need to make a change to the submodule and let your team members see that change, even though the submodule's upstream is slow and/or doesn't accept the patch?

In that situation, we've had to make local shared mirrors of all the submodules and point .gitmodules at that. But that would be your "toy" scenario - our local users have push access to the submodule.

Thanks,
Avery
Previous: Johannes SchindelinNext: Johannes Schindelin
Message 19 of 23 in “What's cooking in git.git (May 2009, #02; Sun, 17)”
  1. Junio C HamanoMay 17, 2009
  2. Jakub NarebskiMay 17, 2009
  3. Junio C HamanoMay 17, 2009
  4. Jakub NarebskiMay 17, 2009
  5. David AguilarMay 17, 2009
  6. Johan HerlandMay 18, 2009
  7. Markus HeidelbergMay 18, 2009
  8. Johan HerlandMay 18, 2009
  9. git-submodule: add support for --merge.Johan Herland, May 19, 2009
  10. Junio C HamanoMay 19, 2009
  11. Johan HerlandMay 19, 2009
  12. Johannes SchindelinMay 19, 2009
  13. Johan HerlandMay 19, 2009
  14. Johannes SchindelinMay 19, 2009
  15. Johan HerlandMay 19, 2009
  16. Johan HerlandMay 25, 2009
  17. Junio C HamanoMay 25, 2009
  18. Johannes SchindelinMay 25, 2009
  19. Avery PennarunMay 25, 2009
  20. Johannes SchindelinMay 25, 2009
  21. Johan HerlandMay 25, 2009
  22. Johan HerlandMay 25, 2009
  23. Peter HuttererMay 25, 2009

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.