diff --git a/git-filter-branch.sh b/git-filter-branch.sh
index 195b5ef48ed3371b2010f9caf711e12089da9c06..e95845c0d6345ccc341d70d17431235197dfd967 100755 (executable)
--- a/git-filter-branch.sh
+++ b/git-filter-branch.sh
die "tree filter failed: $filter_tree"
(
die "tree filter failed: $filter_tree"
(
- git diff-index -r --name-only $commit &&
+ git diff-index -r --name-only --ignore-submodules $commit &&
git ls-files --others
) > "$tempdir"/tree-state || exit
git update-index --add --replace --remove --stdin \
git ls-files --others
) > "$tempdir"/tree-state || exit
git update-index --add --replace --remove --stdin \
"$new_sha1" "$new_ref"
git cat-file tag "$ref" |
sed -n \
"$new_sha1" "$new_ref"
git cat-file tag "$ref" |
sed -n \
- -e "1,/^$/{
+ -e '1,/^$/{
/^object /d
/^type /d
/^tag /d
/^object /d
/^type /d
/^tag /d
- }" \
+ }' \
-e '/^-----BEGIN PGP SIGNATURE-----/q' \
-e 'p' ) |
git mktag) ||
-e '/^-----BEGIN PGP SIGNATURE-----/q' \
-e 'p' ) |
git mktag) ||