Re: Merging submodules (was Re: Feature suggestion: git-hist)
- From
Brian Gernhardt <benji@silverinsanity.com>
- Date
- Jul 30, 2008, 23:03 UTC
- Message-ID
- <20080730230336.GA6481@Hermes>
This message got eaten by a syntax error somewhere. This is a re-send, sorry for any duplicate messages.
On Jul 30, 2008, at 12:26 PM, H.Merijn Brand wrote:
Show 24 quoted lines
> On Wed, 30 Jul 2008 11:15:55 -0400, Brian Gernhardt
> <benji@silverinsanity.com> wrote:
>
> > Then you do something like:
> >
> > rm -rf module_{a,b,c}/.git # Do this in a test repository, obviously...
> > git add module_a module_b module_c
> > git commit # Needed because '-s ours' uses current HEAD, not index
>
> So far so good.
>
> > git merge --no-commit -s ours module_a/master module_b/master module_c/master
>
> $ git merge --no-commit -s ours fnc/master i00f000/master
> i99f000/master include/master l00m000/master l01f000/master
> l02f000/master l03f000/master l06f000/master l90z000/master
> leerpl/master mutbev/master prtabel/master rpt/master tabellen/master
> zoomen/master Automatic merge went well; stopped before committing as
> requested
>
> > git commit --amend
>
> $ git commit --amend
> fatal: You are in the middle of a merge -- cannot amend.Hm. I did mention this was completely untested, yes? The problem comes from the fact that '-s ours' wants to use HEAD, not the index. But you can't amend a normal commit into a merge, apparently. And I don't think you want a commit that adds the files and a commit that "does the merge" as two separate steps.
Well, I don't know how to make the porcelain do this then. But the plumbing can definitely do it. Hopefully someone more used to doing strange things like this can give a simpler recipe, but this should work.
# First reset to the commit you made with all the modules added. vim commit-message # Create a merge message commit=$(git commit-tree HEAD: -p HEAD^ -p module_a/master -p module_b/master -p module_c/master < commit-message) git update-ref HEAD $commit # Update your current ref
~~ Brian