[thirdparty/git.git] / t / t7003-filter-branch.sh

#!/bin/sh

test_description='git filter-branch'
. ./test-lib.sh

test_expect_success 'setup' '
	test_commit A &&
	GIT_COMMITTER_DATE="@0 +0000" GIT_AUTHOR_DATE="@0 +0000" &&
	test_commit --notick B &&
	git checkout -b branch B &&
	test_commit D &&
	mkdir dir &&
	test_commit dir/D &&
	test_commit E &&
	git checkout master &&
	test_commit C &&
	git checkout branch &&
	git merge C &&
	git tag F &&
	test_commit G &&
	test_commit H
'
# * (HEAD, branch) H
# * G
# *   Merge commit 'C' into branch
# |\
# | * (master) C
# * | E
# * | dir/D
# * | D
# |/
# * B
# * A


H=$(git rev-parse H)

test_expect_success 'rewrite identically' '
	git filter-branch branch
'
test_expect_success 'result is really identical' '
	test $H = $(git rev-parse HEAD)
'

test_expect_success 'rewrite bare repository identically' '
	(git config core.bare true && cd .git &&
	 git filter-branch branch > filter-output 2>&1 &&
	! fgrep fatal filter-output)
'
git config core.bare false
test_expect_success 'result is really identical' '
	test $H = $(git rev-parse HEAD)
'

TRASHDIR=$(pwd)
test_expect_success 'correct GIT_DIR while using -d' '
	mkdir drepo &&
	( cd drepo &&
	git init &&
	test_commit drepo &&
	git filter-branch -d "$TRASHDIR/dfoo" \
		--index-filter "cp \"$TRASHDIR\"/dfoo/backup-refs \"$TRASHDIR\"" \
	) &&
	grep drepo "$TRASHDIR/backup-refs"
'

test_expect_success 'Fail if commit filter fails' '
	test_must_fail git filter-branch -f --commit-filter "exit 1" HEAD
'

test_expect_success 'rewrite, renaming a specific file' '
	git filter-branch -f --tree-filter "mv D.t doh || :" HEAD
'

test_expect_success 'test that the file was renamed' '
	test D = "$(git show HEAD:doh --)" &&
	! test -f D.t &&
	test -f doh &&
	test D = "$(cat doh)"
'

test_expect_success 'rewrite, renaming a specific directory' '
	git filter-branch -f --tree-filter "mv dir diroh || :" HEAD
'

test_expect_success 'test that the directory was renamed' '
	test dir/D = "$(git show HEAD:diroh/D.t --)" &&
	! test -d dir &&
	test -d diroh &&
	! test -d diroh/dir &&
	test -f diroh/D.t &&
	test dir/D = "$(cat diroh/D.t)"
'

git tag oldD HEAD~4
test_expect_success 'rewrite one branch, keeping a side branch' '
	git branch modD oldD &&
	git filter-branch -f --tree-filter "mv B.t boh || :" D..modD
'

test_expect_success 'common ancestor is still common (unchanged)' '
	test "$(git merge-base modD D)" = "$(git rev-parse B)"
'

test_expect_success 'filter subdirectory only' '
	mkdir subdir &&
	touch subdir/new &&
	git add subdir/new &&
	test_tick &&
	git commit -m "subdir" &&
	echo H > A.t &&
	test_tick &&
	git commit -m "not subdir" A.t &&
	echo A > subdir/new &&
	test_tick &&
	git commit -m "again subdir" subdir/new &&
	git rm A.t &&
	test_tick &&
	git commit -m "again not subdir" &&
	git branch sub &&
	git branch sub-earlier HEAD~2 &&
	git filter-branch -f --subdirectory-filter subdir \
		refs/heads/sub refs/heads/sub-earlier
'

test_expect_success 'subdirectory filter result looks okay' '
	test 2 = $(git rev-list sub | wc -l) &&
	git show sub:new &&
	test_must_fail git show sub:subdir &&
	git show sub-earlier:new &&
	test_must_fail git show sub-earlier:subdir
'

test_expect_success 'more setup' '
	git checkout master &&
	mkdir subdir &&
	echo A > subdir/new &&
	git add subdir/new &&
	test_tick &&
	git commit -m "subdir on master" subdir/new &&
	git rm A.t &&
	test_tick &&
	git commit -m "again subdir on master" &&
	git merge branch
'

test_expect_success 'use index-filter to move into a subdirectory' '
	git branch directorymoved &&
	git filter-branch -f --index-filter \
		 "git ls-files -s | sed \"s-	-&newsubdir/-\" |
	          GIT_INDEX_FILE=\$GIT_INDEX_FILE.new \
			git update-index --index-info &&
		  mv \"\$GIT_INDEX_FILE.new\" \"\$GIT_INDEX_FILE\"" directorymoved &&
	git diff --exit-code HEAD directorymoved:newsubdir
'

test_expect_success 'stops when msg filter fails' '
	old=$(git rev-parse HEAD) &&
	test_must_fail git filter-branch -f --msg-filter false HEAD &&
	test $old = $(git rev-parse HEAD) &&
	rm -rf .git-rewrite
'

test_expect_success 'author information is preserved' '
	: > i &&
	git add i &&
	test_tick &&
	GIT_AUTHOR_NAME="B V Uips" git commit -m bvuips &&
	git branch preserved-author &&
	git filter-branch -f --msg-filter "cat; \
			test \$GIT_COMMIT != $(git rev-parse master) || \
			echo Hallo" \
		preserved-author &&
	test 1 = $(git rev-list --author="B V Uips" preserved-author | wc -l)
'

test_expect_success "remove a certain author's commits" '
	echo i > i &&
	test_tick &&
	git commit -m i i &&
	git branch removed-author &&
	git filter-branch -f --commit-filter "\
		if [ \"\$GIT_AUTHOR_NAME\" = \"B V Uips\" ];\
		then\
			skip_commit \"\$@\";
		else\
			git commit-tree \"\$@\";\
		fi" removed-author &&
	cnt1=$(git rev-list master | wc -l) &&
	cnt2=$(git rev-list removed-author | wc -l) &&
	test $cnt1 -eq $(($cnt2 + 1)) &&
	test 0 = $(git rev-list --author="B V Uips" removed-author | wc -l)
'

test_expect_success 'barf on invalid name' '
	test_must_fail git filter-branch -f master xy-problem &&
	test_must_fail git filter-branch -f HEAD^
'

test_expect_success '"map" works in commit filter' '
	git filter-branch -f --commit-filter "\
		parent=\$(git rev-parse \$GIT_COMMIT^) &&
		mapped=\$(map \$parent) &&
		actual=\$(echo \"\$@\" | sed \"s/^.*-p //\") &&
		test \$mapped = \$actual &&
		git commit-tree \"\$@\";" master~2..master &&
	git rev-parse --verify master
'

test_expect_success 'Name needing quotes' '

	git checkout -b rerere A &&
	mkdir foo &&
	name="れれれ" &&
	>foo/$name &&
	git add foo &&
	git commit -m "Adding a file" &&
	git filter-branch --tree-filter "rm -fr foo" &&
	test_must_fail git ls-files --error-unmatch "foo/$name" &&
	test $(git rev-parse --verify rerere) != $(git rev-parse --verify A)

'

test_expect_success 'Subdirectory filter with disappearing trees' '
	git reset --hard &&
	git checkout master &&

	mkdir foo &&
	touch foo/bar &&
	git add foo &&
	test_tick &&
	git commit -m "Adding foo" &&

	git rm -r foo &&
	test_tick &&
	git commit -m "Removing foo" &&

	mkdir foo &&
	touch foo/bar &&
	git add foo &&
	test_tick &&
	git commit -m "Re-adding foo" &&

	git filter-branch -f --subdirectory-filter foo &&
	test $(git rev-list master | wc -l) = 3
'

test_expect_success 'Tag name filtering retains tag message' '
	git tag -m atag T &&
	git cat-file tag T > expect &&
	git filter-branch -f --tag-name-filter cat &&
	git cat-file tag T > actual &&
	test_cmp expect actual
'

faux_gpg_tag='object XXXXXX
type commit
tag S
tagger T A Gger <tagger@example.com> 1206026339 -0500

This is a faux gpg signed tag.
-----BEGIN PGP SIGNATURE-----
Version: FauxGPG v0.0.0 (FAUX/Linux)

gdsfoewhxu/6l06f1kxyxhKdZkrcbaiOMtkJUA9ITAc1mlamh0ooasxkH1XwMbYQ
acmwXaWET20H0GeAGP+7vow=
=agpO
-----END PGP SIGNATURE-----
'
test_expect_success 'Tag name filtering strips gpg signature' '
	sha1=$(git rev-parse HEAD) &&
	sha1t=$(echo "$faux_gpg_tag" | sed -e s/XXXXXX/$sha1/ | git mktag) &&
	git update-ref "refs/tags/S" "$sha1t" &&
	echo "$faux_gpg_tag" | sed -e s/XXXXXX/$sha1/ | head -n 6 > expect &&
	git filter-branch -f --tag-name-filter cat &&
	git cat-file tag S > actual &&
	test_cmp expect actual
'

test_expect_success 'Tag name filtering allows slashes in tag names' '
	git tag -m tag-with-slash X/1 &&
	git cat-file tag X/1 | sed -e s,X/1,X/2, > expect &&
	git filter-branch -f --tag-name-filter "echo X/2" &&
	git cat-file tag X/2 > actual &&
	test_cmp expect actual
'

test_expect_success 'Prune empty commits' '
	git rev-list HEAD > expect &&
	test_commit to_remove &&
	git filter-branch -f --index-filter "git update-index --remove to_remove.t" --prune-empty HEAD &&
	git rev-list HEAD > actual &&
	test_cmp expect actual
'

test_expect_success '--remap-to-ancestor with filename filters' '
	git checkout master &&
	git reset --hard A &&
	test_commit add-foo foo 1 &&
	git branch moved-foo &&
	test_commit add-bar bar a &&
	git branch invariant &&
	orig_invariant=$(git rev-parse invariant) &&
	git branch moved-bar &&
	test_commit change-foo foo 2 &&
	git filter-branch -f --remap-to-ancestor \
		moved-foo moved-bar A..master \
		-- -- foo &&
	test $(git rev-parse moved-foo) = $(git rev-parse moved-bar) &&
	test $(git rev-parse moved-foo) = $(git rev-parse master^) &&
	test $orig_invariant = $(git rev-parse invariant)
'

test_expect_success 'automatic remapping to ancestor with filename filters' '
	git checkout master &&
	git reset --hard A &&
	test_commit add-foo2 foo 1 &&
	git branch moved-foo2 &&
	test_commit add-bar2 bar a &&
	git branch invariant2 &&
	orig_invariant=$(git rev-parse invariant2) &&
	git branch moved-bar2 &&
	test_commit change-foo2 foo 2 &&
	git filter-branch -f \
		moved-foo2 moved-bar2 A..master \
		-- -- foo &&
	test $(git rev-parse moved-foo2) = $(git rev-parse moved-bar2) &&
	test $(git rev-parse moved-foo2) = $(git rev-parse master^) &&
	test $orig_invariant = $(git rev-parse invariant2)
'

test_expect_success 'setup submodule' '
	rm -fr ?* .git &&
	git init &&
	test_commit file &&
	mkdir submod &&
	submodurl="$PWD/submod" &&
	( cd submod &&
	  git init &&
	  test_commit file-in-submod ) &&
	git submodule add "$submodurl" &&
	git commit -m "added submodule" &&
	test_commit add-file &&
	( cd submod && test_commit add-in-submodule ) &&
	git add submod &&
	git commit -m "changed submodule" &&
	git branch original HEAD
'

orig_head=`git show-ref --hash --head HEAD`

test_expect_success 'rewrite submodule with another content' '
	git filter-branch --tree-filter "test -d submod && {
					 rm -rf submod &&
					 git rm -rf --quiet submod &&
					 mkdir submod &&
					 : > submod/file
					 } || :" HEAD &&
	test $orig_head != `git show-ref --hash --head HEAD`
'

test_expect_success 'replace submodule revision' '
	git reset --hard original &&
	git filter-branch -f --tree-filter \
	    "if git ls-files --error-unmatch -- submod > /dev/null 2>&1
	     then git update-index --cacheinfo 160000 0123456789012345678901234567890123456789 submod
	     fi" HEAD &&
	test $orig_head != `git show-ref --hash --head HEAD`
'

test_done
Commit	Line	Data
6f6826c5 JS	1	#!/bin/sh
6f6826c5 JS	2
d592b315	3	test_description='git filter-branch'
6f6826c5 JS	4	. ./test-lib.sh
6f6826c5 JS	5
6f6826c5	6	test_expect_success 'setup' '
77f2e4f5	7	test_commit A &&
44b85e89 JH	8	GIT_COMMITTER_DATE="@0 +0000" GIT_AUTHOR_DATE="@0 +0000" &&
44b85e89 JH	9	test_commit --notick B &&
77f2e4f5 BG	10	git checkout -b branch B &&
	11	test_commit D &&
	12	mkdir dir &&
	13	test_commit dir/D &&
	14	test_commit E &&
	15	git checkout master &&
	16	test_commit C &&
	17	git checkout branch &&
	18	git merge C &&
	19	git tag F &&
	20	test_commit G &&
	21	test_commit H
6f6826c5	22	'
77f2e4f5 BG	23	# * (HEAD, branch) H
	24	# * G
	25	# * Merge commit 'C' into branch
	26	# \|\
	27	# \| * (master) C
	28	# * \| E
	29	# * \| dir/D
	30	# * \| D
	31	# \|/
	32	# * B
	33	# * A
	34
6f6826c5	35
5be60078	36	H=$(git rev-parse H)
6f6826c5 JS	37
6f6826c5 JS	38	test_expect_success 'rewrite identically' '
d592b315	39	git filter-branch branch
6f6826c5	40	'
6f6826c5	41	test_expect_success 'result is really identical' '
dfd05e38	42	test $H = $(git rev-parse HEAD)
6f6826c5 JS	43	'
6f6826c5 JS	44
a4661b01	45	test_expect_success 'rewrite bare repository identically' '
9273b562 EK	46	(git config core.bare true && cd .git &&
	47	git filter-branch branch > filter-output 2>&1 &&
	48	! fgrep fatal filter-output)
a4661b01 PB	49	'
	50	git config core.bare false
	51	test_expect_success 'result is really identical' '
	52	test $H = $(git rev-parse HEAD)
	53	'
	54
88e38808 LN	55	TRASHDIR=$(pwd)
	56	test_expect_success 'correct GIT_DIR while using -d' '
	57	mkdir drepo &&
	58	( cd drepo &&
	59	git init &&
	60	test_commit drepo &&
	61	git filter-branch -d "$TRASHDIR/dfoo" \
	62	--index-filter "cp \"$TRASHDIR\"/dfoo/backup-refs \"$TRASHDIR\"" \
	63	) &&
	64	grep drepo "$TRASHDIR/backup-refs"
	65	'
	66
0ea29cce EK	67	test_expect_success 'Fail if commit filter fails' '
	68	test_must_fail git filter-branch -f --commit-filter "exit 1" HEAD
	69	'
	70
6f6826c5	71	test_expect_success 'rewrite, renaming a specific file' '
77f2e4f5	72	git filter-branch -f --tree-filter "mv D.t doh \|\| :" HEAD
6f6826c5 JS	73	'
	74
	75	test_expect_success 'test that the file was renamed' '
77f2e4f5 BG	76	test D = "$(git show HEAD:doh --)" &&
77f2e4f5 BG	77	! test -f D.t &&
46eb449c	78	test -f doh &&
77f2e4f5	79	test D = "$(cat doh)"
90356287 JS	80	'
	81
	82	test_expect_success 'rewrite, renaming a specific directory' '
d592b315	83	git filter-branch -f --tree-filter "mv dir diroh \|\| :" HEAD
90356287 JS	84	'
90356287 JS	85
6a589fda	86	test_expect_success 'test that the directory was renamed' '
77f2e4f5	87	test dir/D = "$(git show HEAD:diroh/D.t --)" &&
90356287 JS	88	! test -d dir &&
	89	test -d diroh &&
	90	! test -d diroh/dir &&
77f2e4f5 BG	91	test -f diroh/D.t &&
77f2e4f5 BG	92	test dir/D = "$(cat diroh/D.t)"
6f6826c5 JS	93	'
6f6826c5 JS	94
dfd05e38	95	git tag oldD HEAD~4
98409060	96	test_expect_success 'rewrite one branch, keeping a side branch' '
dfd05e38	97	git branch modD oldD &&
77f2e4f5	98	git filter-branch -f --tree-filter "mv B.t boh \|\| :" D..modD
98409060 JS	99	'
	100
	101	test_expect_success 'common ancestor is still common (unchanged)' '
5be60078	102	test "$(git merge-base modD D)" = "$(git rev-parse B)"
98409060 JS	103	'
98409060 JS	104
685ef546 JS	105	test_expect_success 'filter subdirectory only' '
	106	mkdir subdir &&
	107	touch subdir/new &&
	108	git add subdir/new &&
	109	test_tick &&
	110	git commit -m "subdir" &&
77f2e4f5	111	echo H > A.t &&
685ef546	112	test_tick &&
77f2e4f5	113	git commit -m "not subdir" A.t &&
685ef546 JS	114	echo A > subdir/new &&
	115	test_tick &&
	116	git commit -m "again subdir" subdir/new &&
77f2e4f5	117	git rm A.t &&
685ef546 JS	118	test_tick &&
685ef546 JS	119	git commit -m "again not subdir" &&
dfd05e38	120	git branch sub &&
6e84b712	121	git branch sub-earlier HEAD~2 &&
9b8ae93a	122	git filter-branch -f --subdirectory-filter subdir \
6e84b712	123	refs/heads/sub refs/heads/sub-earlier
685ef546 JS	124	'
	125
	126	test_expect_success 'subdirectory filter result looks okay' '
5be60078	127	test 2 = $(git rev-list sub \| wc -l) &&
685ef546	128	git show sub:new &&
6e84b712 TR	129	test_must_fail git show sub:subdir &&
	130	git show sub-earlier:new &&
	131	test_must_fail git show sub-earlier:subdir
685ef546 JS	132	'
685ef546 JS	133
a17171b4	134	test_expect_success 'more setup' '
cfabd6ee JS	135	git checkout master &&
	136	mkdir subdir &&
	137	echo A > subdir/new &&
	138	git add subdir/new &&
	139	test_tick &&
	140	git commit -m "subdir on master" subdir/new &&
77f2e4f5	141	git rm A.t &&
cfabd6ee JS	142	test_tick &&
cfabd6ee JS	143	git commit -m "again subdir on master" &&
a17171b4	144	git merge branch
cfabd6ee JS	145	'
cfabd6ee JS	146
55f22ff2	147	test_expect_success 'use index-filter to move into a subdirectory' '
dfd05e38	148	git branch directorymoved &&
d592b315	149	git filter-branch -f --index-filter \
0d1d6e50	150	"git ls-files -s \| sed \"s- -&newsubdir/-\" \|
55f22ff2	151	GIT_INDEX_FILE=\$GIT_INDEX_FILE.new \
5be60078	152	git update-index --index-info &&
f69e836f	153	mv \"\$GIT_INDEX_FILE.new\" \"\$GIT_INDEX_FILE\"" directorymoved &&
3c8710ae TR	154	git diff --exit-code HEAD directorymoved:newsubdir
3c8710ae TR	155	'
55f22ff2	156
8c1ce0f4	157	test_expect_success 'stops when msg filter fails' '
dfd05e38	158	old=$(git rev-parse HEAD) &&
d592b315	159	test_must_fail git filter-branch -f --msg-filter false HEAD &&
dfd05e38 JS	160	test $old = $(git rev-parse HEAD) &&
dfd05e38 JS	161	rm -rf .git-rewrite
8c1ce0f4 JS	162	'
8c1ce0f4 JS	163
f6b78c6e JS	164	test_expect_success 'author information is preserved' '
	165	: > i &&
	166	git add i &&
	167	test_tick &&
	168	GIT_AUTHOR_NAME="B V Uips" git commit -m bvuips &&
dfd05e38	169	git branch preserved-author &&
d592b315	170	git filter-branch -f --msg-filter "cat; \
8c1ce0f4	171	test \$GIT_COMMIT != $(git rev-parse master) \|\| \
f6b78c6e JS	172	echo Hallo" \
	173	preserved-author &&
	174	test 1 = $(git rev-list --author="B V Uips" preserved-author \| wc -l)
	175	'
	176
	177	test_expect_success "remove a certain author's commits" '
	178	echo i > i &&
	179	test_tick &&
	180	git commit -m i i &&
dfd05e38	181	git branch removed-author &&
d592b315	182	git filter-branch -f --commit-filter "\
f6b78c6e JS	183	if [ \"\$GIT_AUTHOR_NAME\" = \"B V Uips\" ];\
f6b78c6e JS	184	then\
f95eef15	185	skip_commit \"\$@\";
f6b78c6e JS	186	else\
	187	git commit-tree \"\$@\";\
	188	fi" removed-author &&
	189	cnt1=$(git rev-list master \| wc -l) &&
	190	cnt2=$(git rev-list removed-author \| wc -l) &&
	191	test $cnt1 -eq $(($cnt2 + 1)) &&
	192	test 0 = $(git rev-list --author="B V Uips" removed-author \| wc -l)
	193	'
	194
dfd05e38	195	test_expect_success 'barf on invalid name' '
c8a08692 BC	196	test_must_fail git filter-branch -f master xy-problem &&
c8a08692 BC	197	test_must_fail git filter-branch -f HEAD^
dfd05e38 JS	198	'
dfd05e38 JS	199
7e0f1704 JS	200	test_expect_success '"map" works in commit filter' '
	201	git filter-branch -f --commit-filter "\
	202	parent=\$(git rev-parse \$GIT_COMMIT^) &&
	203	mapped=\$(map \$parent) &&
	204	actual=\$(echo \"\$@\" \| sed \"s/^.*-p //\") &&
	205	test \$mapped = \$actual &&
	206	git commit-tree \"\$@\";" master~2..master &&
	207	git rev-parse --verify master
	208	'
	209
1fe32cb9 JH	210	test_expect_success 'Name needing quotes' '
	211
	212	git checkout -b rerere A &&
	213	mkdir foo &&
	214	name="れれれ" &&
	215	>foo/$name &&
	216	git add foo &&
	217	git commit -m "Adding a file" &&
	218	git filter-branch --tree-filter "rm -fr foo" &&
c8a08692	219	test_must_fail git ls-files --error-unmatch "foo/$name" &&
1fe32cb9 JH	220	test $(git rev-parse --verify rerere) != $(git rev-parse --verify A)
	221
	222	'
	223
5b044ac3 JH	224	test_expect_success 'Subdirectory filter with disappearing trees' '
	225	git reset --hard &&
	226	git checkout master &&
	227
	228	mkdir foo &&
	229	touch foo/bar &&
	230	git add foo &&
	231	test_tick &&
	232	git commit -m "Adding foo" &&
	233
	234	git rm -r foo &&
	235	test_tick &&
	236	git commit -m "Removing foo" &&
	237
	238	mkdir foo &&
	239	touch foo/bar &&
	240	git add foo &&
	241	test_tick &&
	242	git commit -m "Re-adding foo" &&
	243
	244	git filter-branch -f --subdirectory-filter foo &&
	245	test $(git rev-list master \| wc -l) = 3
	246	'
	247
1bf6551e BC	248	test_expect_success 'Tag name filtering retains tag message' '
	249	git tag -m atag T &&
	250	git cat-file tag T > expect &&
	251	git filter-branch -f --tag-name-filter cat &&
	252	git cat-file tag T > actual &&
3af82863	253	test_cmp expect actual
1bf6551e BC	254	'
	255
	256	faux_gpg_tag='object XXXXXX
	257	type commit
	258	tag S
	259	tagger T A Gger <tagger@example.com> 1206026339 -0500
	260
	261	This is a faux gpg signed tag.
	262	-----BEGIN PGP SIGNATURE-----
	263	Version: FauxGPG v0.0.0 (FAUX/Linux)
	264
	265	gdsfoewhxu/6l06f1kxyxhKdZkrcbaiOMtkJUA9ITAc1mlamh0ooasxkH1XwMbYQ
	266	acmwXaWET20H0GeAGP+7vow=
	267	=agpO
	268	-----END PGP SIGNATURE-----
	269	'
	270	test_expect_success 'Tag name filtering strips gpg signature' '
	271	sha1=$(git rev-parse HEAD) &&
	272	sha1t=$(echo "$faux_gpg_tag" \| sed -e s/XXXXXX/$sha1/ \| git mktag) &&
	273	git update-ref "refs/tags/S" "$sha1t" &&
	274	echo "$faux_gpg_tag" \| sed -e s/XXXXXX/$sha1/ \| head -n 6 > expect &&
	275	git filter-branch -f --tag-name-filter cat &&
	276	git cat-file tag S > actual &&
3af82863	277	test_cmp expect actual
1bf6551e BC	278	'
1bf6551e BC	279
a9da1663 JS	280	test_expect_success 'Tag name filtering allows slashes in tag names' '
	281	git tag -m tag-with-slash X/1 &&
	282	git cat-file tag X/1 \| sed -e s,X/1,X/2, > expect &&
	283	git filter-branch -f --tag-name-filter "echo X/2" &&
	284	git cat-file tag X/2 > actual &&
	285	test_cmp expect actual
	286	'
	287
d3240d93 PH	288	test_expect_success 'Prune empty commits' '
d3240d93 PH	289	git rev-list HEAD > expect &&
77f2e4f5 BG	290	test_commit to_remove &&
77f2e4f5 BG	291	git filter-branch -f --index-filter "git update-index --remove to_remove.t" --prune-empty HEAD &&
d3240d93 PH	292	git rev-list HEAD > actual &&
	293	test_cmp expect actual
	294	'
	295
f2f3a6b8 TR	296	test_expect_success '--remap-to-ancestor with filename filters' '
	297	git checkout master &&
	298	git reset --hard A &&
	299	test_commit add-foo foo 1 &&
	300	git branch moved-foo &&
	301	test_commit add-bar bar a &&
	302	git branch invariant &&
	303	orig_invariant=$(git rev-parse invariant) &&
	304	git branch moved-bar &&
	305	test_commit change-foo foo 2 &&
	306	git filter-branch -f --remap-to-ancestor \
	307	moved-foo moved-bar A..master \
	308	-- -- foo &&
	309	test $(git rev-parse moved-foo) = $(git rev-parse moved-bar) &&
	310	test $(git rev-parse moved-foo) = $(git rev-parse master^) &&
	311	test $orig_invariant = $(git rev-parse invariant)
	312	'
	313
7ec344d8 CH	314	test_expect_success 'automatic remapping to ancestor with filename filters' '
	315	git checkout master &&
	316	git reset --hard A &&
	317	test_commit add-foo2 foo 1 &&
	318	git branch moved-foo2 &&
	319	test_commit add-bar2 bar a &&
	320	git branch invariant2 &&
	321	orig_invariant=$(git rev-parse invariant2) &&
	322	git branch moved-bar2 &&
	323	test_commit change-foo2 foo 2 &&
	324	git filter-branch -f \
	325	moved-foo2 moved-bar2 A..master \
	326	-- -- foo &&
	327	test $(git rev-parse moved-foo2) = $(git rev-parse moved-bar2) &&
	328	test $(git rev-parse moved-foo2) = $(git rev-parse master^) &&
	329	test $orig_invariant = $(git rev-parse invariant2)
	330	'
	331
1f7d57ff MS	332	test_expect_success 'setup submodule' '
	333	rm -fr ?* .git &&
	334	git init &&
	335	test_commit file &&
	336	mkdir submod &&
	337	submodurl="$PWD/submod" &&
	338	( cd submod &&
	339	git init &&
	340	test_commit file-in-submod ) &&
	341	git submodule add "$submodurl" &&
	342	git commit -m "added submodule" &&
	343	test_commit add-file &&
	344	( cd submod && test_commit add-in-submodule ) &&
	345	git add submod &&
	346	git commit -m "changed submodule" &&
	347	git branch original HEAD
	348	'
	349
	350	orig_head=`git show-ref --hash --head HEAD`
	351
	352	test_expect_success 'rewrite submodule with another content' '
	353	git filter-branch --tree-filter "test -d submod && {
	354	rm -rf submod &&
	355	git rm -rf --quiet submod &&
	356	mkdir submod &&
	357	: > submod/file
	358	} \|\| :" HEAD &&
	359	test $orig_head != `git show-ref --hash --head HEAD`
	360	'
	361
	362	test_expect_success 'replace submodule revision' '
	363	git reset --hard original &&
	364	git filter-branch -f --tree-filter \
	365	"if git ls-files --error-unmatch -- submod > /dev/null 2>&1
	366	then git update-index --cacheinfo 160000 0123456789012345678901234567890123456789 submod
	367	fi" HEAD &&
	368	test $orig_head != `git show-ref --hash --head HEAD`
	369	'
	370
6f6826c5	371	test_done