Re: Submodules and branches
On Fri, Apr 4, 2008 at 1:02 PM, Avery Pennarun <apenwarr@gmail.com> wrote:
Show 19 quoted lines
> 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