From: Andreas Ericsson <ae@op5.se>
To: "Ask Bjørn Hansen" <ask@develooper.com>
Cc: git@vger.kernel.org
Subject: Re: git submodule merge madness
Date: Mon, 12 Jan 2009 14:27:16 +0100 [thread overview]
Message-ID: <496B4534.9020809@op5.se> (raw)
In-Reply-To: <ADC7A3B1-6756-4258-93CD-DB40C7D2793C@develooper.com>
Ask Bjørn Hansen wrote:
> Hi,
>
> We've (again) replaced a few directories with submodules. Man, it's
> madness!
>
> The typical problem is that we get an error trying to merge a
> "pre-submodule" branch into master:
>
> fatal: cannot read object 894c77319a18c4d48119c2985a9275c9f5883584
> 'some/sub/dir': It is a submodule!
> Mark Levedahl wrote an example in July, but I don't think he got any
> replies: http://marc.info/?l=git&m=121587851313303
> Any ideas? Is there something we can do? I see a strong correlation
> between adding a new submodule and the number of "git sucks" messages on
> our internal IRC server.
>
Well, reworking the repository structure (which is essentially what you're
doing) should be a flag day. Merge stuff before that and mark it in some
way so that you don't run into the problems you're seeing now.
--
Andreas Ericsson andreas.ericsson@op5.se
OP5 AB www.op5.se
Tel: +46 8-230225 Fax: +46 8-230231
next prev parent reply other threads:[~2009-01-12 13:28 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-09 21:50 git submodule merge madness Ask Bjørn Hansen
2009-01-10 1:13 ` Ask Bjørn Hansen
2009-01-12 13:27 ` Andreas Ericsson [this message]
2009-01-14 22:55 ` Johannes Schindelin
2009-01-14 23:49 ` Ask Bjørn Hansen
2009-01-15 0:32 ` Sverre Rabbelier
2009-01-15 0:36 ` Johannes Schindelin
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=496B4534.9020809@op5.se \
--to=ae@op5.se \
--cc=ask@develooper.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).