From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 3 Feb 2010 05:48:34 +0000 (-0800)
Subject: Merge branch 'ms/filter-branch-submodule'
X-Git-Tag: v1.7.0-rc2~21
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/4b7acc186f33037178f4d137b2e6099c67492bde?ds=inline;hp=-c

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
---

4b7acc186f33037178f4d137b2e6099c67492bde
diff --combined git-filter-branch.sh
index 81fd3dba3d,7c4ad7dcf9..e95845c0d6
--- a/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) ||