Submodules and branches

Submodules and branches

[Pat Maddox]

I've got a repository that uses submodules.  If I cd to the repo root
and create a branch, all the submodules are switched to that branch as
well.  All good so far.  I go into the submodules and do my work,
committing as I go along.  Then when I'm all done and want to merge
the changes into my master branch, I cd back to the repo root and do
"git merge new_topic"

That's where it breaks down.  The commits that I made go into the
master repo itself, and the submodules don't have them.  So when I
push from the submodule to its origin, nothing goes through.  The code
is now a part of the master repo.

Is it possible for me to use branches like usual, but with submodules?

Pat

Re: Submodules and branches

[Avery Pennarun]

On 4/4/08, Pat Maddox <pergesu@gmail.com> wrote:
> I've got a repository that uses submodules.  If I cd to the repo root
>  and create a branch, all the submodules are switched to that branch as
>  well.  All good so far.  I go into the submodules and do my work,
>  committing as I go along.  Then when I'm all done and want to merge
>  the changes into my master branch, I cd back to the repo root and do
>  "git merge new_topic"
>
>  That's where it breaks down.  The commits that I made go into the
>  master repo itself, and the submodules don't have them.

There is something wrong with your story somewhere: submodules in git
each have their own, completely independent,
branching/merging/pulling/pushing etc.  What makes you think the
submodules are branching at the same time as your supermodule?

Perhaps you have accidentally committed the *files* from your
submodule into your supermodule, which means you're not using
git-submodule at all.

Have fun,

Avery

Re: Submodules and branches

[Pat Maddox]

On Fri, Apr 4, 2008 at 1:02 PM, Avery Pennarun <apenwarr@gmail.com> wrote:
> On 4/4/08, Pat Maddox <pergesu@gmail.com> wrote:
>  > I've got a repository that uses submodules.  If I cd to the repo root
>  >  and create a branch, all the submodules are switched to that branch as
>  >  well.  All good so far.  I go into the submodules and do my work,
>  >  committing as I go along.  Then when I'm all done and want to merge
>  >  the changes into my master branch, I cd back to the repo root and do
>  >  "git merge new_topic"
>  >
>  >  That's where it breaks down.  The commits that I made go into the
>  >  master repo itself, and the submodules don't have them.
>
>  There is something wrong with your story somewhere: submodules in git
>  each have their own, completely independent,
>  branching/merging/pulling/pushing etc.  What makes you think the
>  submodules are branching at the same time as your supermodule?
>
>  Perhaps you have accidentally committed the *files* from your
>  submodule into your supermodule, which means you're not using
>  git-submodule at all.

Hi Avery,

You're right, something was screwed up with the repo.  One of the
paths was added as a submodule, but it also had files committed to it.
 I fixed all of that up and it seems to be fine now.

Pat

submodules and branches

[Stephen Hemminger]

Our CM team likes to use both submodules and branches and it doesn't
always work cleanly.  Some examples:

1. The new release on branch "next_release" adds a submodule, but then the
submodule shows up on all branches including the production branch.

2. For next release on branch "next_release" a submodule was renamed by
moving the target directory, but now git submodule update makes two copies.

Git generally does a good job of tracking renames and deletions, so the fact
that submodules leave stuff behind is surprising.