Converting a directory to submodule

Converting a directory to submodule

[Paul Sadauskas]

Dear list,

I'm having some trouble when I change an existing directory in a
project into a submodule. After pushing this change to the origin, I
can no longer pull into any other projects. I can, however, clone the
origin without problems.

These are the steps I take to change the dir into a submod:

rm -rf /submod
git commit -a
git submodule add git://abc/submod submod
git commit
git push

But then attempting to pull this anywhere else results in a
half-completed pull, and dies with the error:

fatal: cannot read object bb138891993fdeb3dbfcb41fe8c2a4693676f8fe
'submod~564e58282ce575db34b6f249a42b1ea59f56efd3'
Merge with strategy recursive failed.

Like I said, though, a fresh clone works fine. Am I doing something
wrong in my push, or is this a bug?

Thanks,
Paul Sadauskas