summaryrefslogtreecommitdiff
path: root/t/t6030-bisect-porcelain.sh
diff options
context:
space:
mode:
authorLibravatar Michal Sojka <sojkam1@fel.cvut.cz>2010-01-28 10:08:46 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-01-28 13:49:53 -0800
commit03ca839537c9df35cc58085daa2b75febd373edd (patch)
treee5c8ecf6ad9fe89d232d642a98be8258294ac550 /t/t6030-bisect-porcelain.sh
parentgitweb.js: Workaround for IE8 bug (diff)
downloadtgif-03ca839537c9df35cc58085daa2b75febd373edd.tar.xz
filter-branch: Fix to allow replacing submodules with another content
When git filter-branch is used to replace a submodule with another content, it always fails on the first commit. Consider a repository with submod directory containing a submodule. The following command to remove the submodule and replace it with a file fails: git filter-branch --tree-filter 'rm -rf submod && git rm -q submod && mkdir submod && touch submod/file' with an error: error: submod: is a directory - add files inside instead The reason is that git diff-index, which generates the first part of the list of files updated by the tree filter, emits also the removed submodule even if it was replaced by a real directory. Signed-off-by: Michal Sojka <sojkam1@fel.cvut.cz> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6030-bisect-porcelain.sh')
0 files changed, 0 insertions, 0 deletions