[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 'tree-filter works with -d' '
	git init drepo-tree &&
	(
		cd drepo-tree &&
		test_commit one &&
		git filter-branch -d "$TRASHDIR/dfoo" \
			--tree-filter "echo changed >one.t" &&
		echo changed >expect &&
		git cat-file blob HEAD:one.t >actual &&
		test_cmp expect actual &&
		test_cmp one.t actual
	)
'

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