From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Mon, 11 Jan 2010 18:02:06 GMT
Subject: Re: [PATCH/RFC] filter-branch: Fix to allow replacing submodules with another content
Message-ID: <alpine.DEB.1.00.1001111901380.4985@pacific.mpi-cbg.de>
In-Reply-To: <1263227634-11259-1-git-send-email-sojkam1@fel.cvut.cz>

Hi,

On Mon, 11 Jan 2010, Michal Sojka wrote:

> When git filter-branch is used to replace a submodule with another
> content, it always fails on the first commit. Consider a repository with
> directory submodule containing a submodule. If I want to remove the
> submodule and replace it with a file, the following command fails.
> 
> git filter-branch --tree-filter 'rm -rf submodule &&
> 				 git rm -q submodule &&
> 				 mkdir submodule &&
> 				 touch submodule/file'
> 
> The error message is:
> error: submodule: is a directory - add files inside instead
> 
> The reason is that git diff-index, which generates a part of the list of
> files to update-index, emits also the removed submodule even if it was
> replaced by a real directory.
> 
> Adding --ignored-submodules solves the problem for me and
> tests in t7003-filter-branch.sh passes correctly.

Have you tested replacing one revision of a submodule with another?

Ciao,
Dscho