git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Nigel Magnay" <nigel.magnay@gmail.com>
To: "Git Mailing List" <git@vger.kernel.org>
Subject: git submodules and commit
Date: Wed, 16 Jul 2008 11:32:48 +0100	[thread overview]
Message-ID: <320075ff0807160332k5e49c256tb4191de628ecf41c@mail.gmail.com> (raw)
In-Reply-To: <320075ff0807160331j30e8f832m4de3e3bbe9c26801@mail.gmail.com>

I wonder if this is a fairly common pattern. We tend to have modules
as git repositories, and projects that tie together those git
repositories as submodules. In general, > 90% of the work is done in
one module, and the following stanza gets used a lot:

cd /proj/modA
git commit -s -m "Some change"
git push

cd ..
git add modA
git commit -s -m "Some change (modA)"
git push

But since this is much more cumbersome than (say) "svn ci", what often
happens is developers just commit into modA, then carry on. Or for
people just learning git, they somtimes screw up, and push the parent
proj but not the child modA

This is a shame, as it means any external people pulling updates
directly from proj will not get this change (e.g. CI tools
speculatively compiling against every developer tree).

For me, in some really high proportion of cases, I think I want 'git
commit' to mean 'commit to any child repositories, any sibling
repositories, and any parent repositories (updating the submodule sha1
as appropriate). In other words, 'pretend like the whole thing is one
big repo'.

I guess it probably gets sticky when there are merge conflicts. Is
anyone working on this kind of thing; I might be able to give some
time to help work on it?

       reply	other threads:[~2008-07-16 10:33 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <320075ff0807160331j30e8f832m4de3e3bbe9c26801@mail.gmail.com>
2008-07-16 10:32 ` Nigel Magnay [this message]
2008-07-16 10:47   ` git submodules and commit Johannes Sixt
2008-07-16 11:02     ` Nigel Magnay
2008-07-16 11:35       ` Johannes Sixt
2008-07-16 12:11         ` Petr Baudis
2008-07-16 12:48         ` Nigel Magnay
2008-07-16 13:38           ` Johannes Sixt
2008-07-16 14:03             ` Nigel Magnay
2008-07-16 14:17               ` Petr Baudis
2008-07-16 14:31                 ` Nigel Magnay
2008-07-16 15:43   ` Avery Pennarun
2008-07-17  9:47     ` Nigel Magnay
2008-07-17 15:12       ` Avery Pennarun
2008-07-18 16:11     ` Ping Yin

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=320075ff0807160332k5e49c256tb4191de628ecf41c@mail.gmail.com \
    --to=nigel.magnay@gmail.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.
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).