Merge branch 'ms/filter-branch-submodule'

* ms/filter-branch-submodule:
filter-branch: Add tests for submodules in tree-filter
filter-branch: Fix to allow replacing submodules with another content

diff --combined git-filter-branch.sh
index 81fd3dba3de9671a1202bea389ad192cdd31c6ef,7c4ad7dcf9c29030ac5c40a0ef3820c8b0287f8a..e95845c0d6345ccc341d70d17431235197dfd967
--- 1/git-filter-branch.sh
--- 2/git-filter-branch.sh
+++ b/git-filter-branch.sh
@@@ -331,7 -331,7 +331,7 @@@ while read commit parents; d
                        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 \
@@@ -462,11 -462,11 +462,11 @@@ if [ "$filter_tag_name" ]; the
                                                "$new_sha1" "$new_ref"
                                git cat-file tag "$ref" |
                                sed -n \
 -                                  -e "1,/^$/{
 +                                  -e '1,/^$/{
                                          /^object /d
                                          /^type /d
                                          /^tag /d
 -                                      }" \
 +                                      }' \
                                    -e '/^-----BEGIN PGP SIGNATURE-----/q' \
                                    -e 'p' ) |
                                git mktag) ||