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

#!/bin/sh

test_description='git filter-branch'
. ./test-lib.sh
. "$TEST_DIRECTORY/lib-gpg.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) &&
	git rev-list --author="B V Uips" preserved-author >actual &&
	test_line_count = 1 actual
'

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)) &&
	git rev-list --author="B V Uips" removed-author >actual &&
	test_line_count = 0 actual
'

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 &&
	git rev-list master >actual &&
	test_line_count = 3 actual
'

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 GPG 'Filtering retains message of gpg signed commit' '
	mkdir gpg &&
	touch gpg/foo &&
	git add gpg &&
	test_tick &&
	git commit -S -m "Adding gpg" &&

	git log -1 --format="%s" > expect &&
	git filter-branch -f --msg-filter "cat" &&
	git log -1 --format="%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 'setup --prune-empty comparisons' '
	git checkout --orphan master-no-a &&
	git rm -rf . &&
	unset test_tick &&
	test_tick &&
	GIT_COMMITTER_DATE="@0 +0000" GIT_AUTHOR_DATE="@0 +0000" &&
	test_commit --notick B B.t B Bx &&
	git checkout -b branch-no-a Bx &&
	test_commit D D.t D Dx &&
	mkdir dir &&
	test_commit dir/D dir/D.t dir/D dir/Dx &&
	test_commit E E.t E Ex &&
	git checkout master-no-a &&
	test_commit C C.t C Cx &&
	git checkout branch-no-a &&
	git merge Cx -m "Merge tag '\''C'\'' into branch" &&
	git tag Fx &&
	test_commit G G.t G Gx &&
	test_commit H H.t H Hx &&
	git checkout branch
'

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 'prune empty works even without index/tree filters' '
	git rev-list HEAD >expect &&
	git commit --allow-empty -m empty &&
	git filter-branch -f --prune-empty HEAD &&
	git rev-list HEAD >actual &&
	test_cmp expect actual
'

test_expect_success '--prune-empty is able to prune root commit' '
	git rev-list branch-no-a >expect &&
	git branch testing H &&
	git filter-branch -f --prune-empty --index-filter "git update-index --remove A.t" testing &&
	git rev-list testing >actual &&
	git branch -D testing &&
	test_cmp expect actual
'

test_expect_success '--prune-empty is able to prune entire branch' '
	git branch prune-entire B &&
	git filter-branch -f --prune-empty --index-filter "git update-index --remove A.t B.t" prune-entire &&
	test_path_is_missing .git/refs/heads/prune-entire &&
	test_must_fail git reflog exists refs/heads/prune-entire
'

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_expect_success 'filter commit message without trailing newline' '
	git reset --hard original &&
	commit=$(printf "no newline" | git commit-tree HEAD^{tree}) &&
	git update-ref refs/heads/no-newline $commit &&
	git filter-branch -f refs/heads/no-newline &&
	echo $commit >expect &&
	git rev-parse refs/heads/no-newline >actual &&
	test_cmp expect actual
'

test_expect_success 'tree-filter deals with object name vs pathname ambiguity' '
	test_when_finished "git reset --hard original" &&
	ambiguous=$(git rev-list -1 HEAD) &&
	git filter-branch --tree-filter "mv file.t $ambiguous" HEAD^.. &&
	git show HEAD:$ambiguous
'

test_expect_success 'rewrite repository including refs that point at non-commit object' '
	test_when_finished "git reset --hard original" &&
	tree=$(git rev-parse HEAD^{tree}) &&
	test_when_finished "git replace -d $tree" &&
	echo A >new &&
	git add new &&
	new_tree=$(git write-tree) &&
	git replace $tree $new_tree &&
	git tag -a -m "tag to a tree" treetag $new_tree &&
	git reset --hard HEAD &&
	git filter-branch -f -- --all >filter-output 2>&1 &&
	! fgrep fatal filter-output
'

test_done
Commit	Line	Data
6f6826c5 JS	1	#!/bin/sh
6f6826c5 JS	2
d592b315	3	test_description='git filter-branch'
6f6826c5	4	. ./test-lib.sh
a5a4b3ff	5	. "$TEST_DIRECTORY/lib-gpg.sh"
6f6826c5	6
6f6826c5	7	test_expect_success 'setup' '
77f2e4f5	8	test_commit A &&
44b85e89 JH	9	GIT_COMMITTER_DATE="@0 +0000" GIT_AUTHOR_DATE="@0 +0000" &&
44b85e89 JH	10	test_commit --notick B &&
77f2e4f5 BG	11	git checkout -b branch B &&
	12	test_commit D &&
	13	mkdir dir &&
	14	test_commit dir/D &&
	15	test_commit E &&
	16	git checkout master &&
	17	test_commit C &&
	18	git checkout branch &&
	19	git merge C &&
	20	git tag F &&
	21	test_commit G &&
	22	test_commit H
6f6826c5	23	'
77f2e4f5 BG	24	# * (HEAD, branch) H
	25	# * G
	26	# * Merge commit 'C' into branch
	27	# \|\
	28	# \| * (master) C
	29	# * \| E
	30	# * \| dir/D
	31	# * \| D
	32	# \|/
	33	# * B
	34	# * A
	35
6f6826c5	36
5be60078	37	H=$(git rev-parse H)
6f6826c5 JS	38
6f6826c5 JS	39	test_expect_success 'rewrite identically' '
d592b315	40	git filter-branch branch
6f6826c5	41	'
6f6826c5	42	test_expect_success 'result is really identical' '
dfd05e38	43	test $H = $(git rev-parse HEAD)
6f6826c5 JS	44	'
6f6826c5 JS	45
a4661b01	46	test_expect_success 'rewrite bare repository identically' '
9273b562 EK	47	(git config core.bare true && cd .git &&
	48	git filter-branch branch > filter-output 2>&1 &&
	49	! fgrep fatal filter-output)
a4661b01 PB	50	'
	51	git config core.bare false
	52	test_expect_success 'result is really identical' '
	53	test $H = $(git rev-parse HEAD)
	54	'
	55
88e38808 LN	56	TRASHDIR=$(pwd)
	57	test_expect_success 'correct GIT_DIR while using -d' '
	58	mkdir drepo &&
	59	( cd drepo &&
	60	git init &&
	61	test_commit drepo &&
	62	git filter-branch -d "$TRASHDIR/dfoo" \
	63	--index-filter "cp \"$TRASHDIR\"/dfoo/backup-refs \"$TRASHDIR\"" \
	64	) &&
	65	grep drepo "$TRASHDIR/backup-refs"
	66	'
	67
97276019 JK	68	test_expect_success 'tree-filter works with -d' '
	69	git init drepo-tree &&
	70	(
	71	cd drepo-tree &&
	72	test_commit one &&
	73	git filter-branch -d "$TRASHDIR/dfoo" \
	74	--tree-filter "echo changed >one.t" &&
	75	echo changed >expect &&
	76	git cat-file blob HEAD:one.t >actual &&
	77	test_cmp expect actual &&
	78	test_cmp one.t actual
	79	)
	80	'
	81
0ea29cce EK	82	test_expect_success 'Fail if commit filter fails' '
	83	test_must_fail git filter-branch -f --commit-filter "exit 1" HEAD
	84	'
	85
6f6826c5	86	test_expect_success 'rewrite, renaming a specific file' '
77f2e4f5	87	git filter-branch -f --tree-filter "mv D.t doh \|\| :" HEAD
6f6826c5 JS	88	'
	89
	90	test_expect_success 'test that the file was renamed' '
77f2e4f5 BG	91	test D = "$(git show HEAD:doh --)" &&
77f2e4f5 BG	92	! test -f D.t &&
46eb449c	93	test -f doh &&
77f2e4f5	94	test D = "$(cat doh)"
90356287 JS	95	'
	96
	97	test_expect_success 'rewrite, renaming a specific directory' '
d592b315	98	git filter-branch -f --tree-filter "mv dir diroh \|\| :" HEAD
90356287 JS	99	'
90356287 JS	100
6a589fda	101	test_expect_success 'test that the directory was renamed' '
77f2e4f5	102	test dir/D = "$(git show HEAD:diroh/D.t --)" &&
90356287 JS	103	! test -d dir &&
	104	test -d diroh &&
	105	! test -d diroh/dir &&
77f2e4f5 BG	106	test -f diroh/D.t &&
77f2e4f5 BG	107	test dir/D = "$(cat diroh/D.t)"
6f6826c5 JS	108	'
6f6826c5 JS	109
dfd05e38	110	git tag oldD HEAD~4
98409060	111	test_expect_success 'rewrite one branch, keeping a side branch' '
dfd05e38	112	git branch modD oldD &&
77f2e4f5	113	git filter-branch -f --tree-filter "mv B.t boh \|\| :" D..modD
98409060 JS	114	'
	115
	116	test_expect_success 'common ancestor is still common (unchanged)' '
5be60078	117	test "$(git merge-base modD D)" = "$(git rev-parse B)"
98409060 JS	118	'
98409060 JS	119
685ef546 JS	120	test_expect_success 'filter subdirectory only' '
	121	mkdir subdir &&
	122	touch subdir/new &&
	123	git add subdir/new &&
	124	test_tick &&
	125	git commit -m "subdir" &&
77f2e4f5	126	echo H > A.t &&
685ef546	127	test_tick &&
77f2e4f5	128	git commit -m "not subdir" A.t &&
685ef546 JS	129	echo A > subdir/new &&
	130	test_tick &&
	131	git commit -m "again subdir" subdir/new &&
77f2e4f5	132	git rm A.t &&
685ef546 JS	133	test_tick &&
685ef546 JS	134	git commit -m "again not subdir" &&
dfd05e38	135	git branch sub &&
6e84b712	136	git branch sub-earlier HEAD~2 &&
9b8ae93a	137	git filter-branch -f --subdirectory-filter subdir \
6e84b712	138	refs/heads/sub refs/heads/sub-earlier
685ef546 JS	139	'
	140
	141	test_expect_success 'subdirectory filter result looks okay' '
5be60078	142	test 2 = $(git rev-list sub \| wc -l) &&
685ef546	143	git show sub:new &&
6e84b712 TR	144	test_must_fail git show sub:subdir &&
	145	git show sub-earlier:new &&
	146	test_must_fail git show sub-earlier:subdir
685ef546 JS	147	'
685ef546 JS	148
a17171b4	149	test_expect_success 'more setup' '
cfabd6ee JS	150	git checkout master &&
	151	mkdir subdir &&
	152	echo A > subdir/new &&
	153	git add subdir/new &&
	154	test_tick &&
	155	git commit -m "subdir on master" subdir/new &&
77f2e4f5	156	git rm A.t &&
cfabd6ee JS	157	test_tick &&
cfabd6ee JS	158	git commit -m "again subdir on master" &&
a17171b4	159	git merge branch
cfabd6ee JS	160	'
cfabd6ee JS	161
55f22ff2	162	test_expect_success 'use index-filter to move into a subdirectory' '
dfd05e38	163	git branch directorymoved &&
d592b315	164	git filter-branch -f --index-filter \
0d1d6e50	165	"git ls-files -s \| sed \"s- -&newsubdir/-\" \|
55f22ff2	166	GIT_INDEX_FILE=\$GIT_INDEX_FILE.new \
5be60078	167	git update-index --index-info &&
f69e836f	168	mv \"\$GIT_INDEX_FILE.new\" \"\$GIT_INDEX_FILE\"" directorymoved &&
3c8710ae TR	169	git diff --exit-code HEAD directorymoved:newsubdir
3c8710ae TR	170	'
55f22ff2	171
8c1ce0f4	172	test_expect_success 'stops when msg filter fails' '
dfd05e38	173	old=$(git rev-parse HEAD) &&
d592b315	174	test_must_fail git filter-branch -f --msg-filter false HEAD &&
dfd05e38 JS	175	test $old = $(git rev-parse HEAD) &&
dfd05e38 JS	176	rm -rf .git-rewrite
8c1ce0f4 JS	177	'
8c1ce0f4 JS	178
f6b78c6e JS	179	test_expect_success 'author information is preserved' '
	180	: > i &&
	181	git add i &&
	182	test_tick &&
	183	GIT_AUTHOR_NAME="B V Uips" git commit -m bvuips &&
dfd05e38	184	git branch preserved-author &&
3c730fab JK	185	(sane_unset GIT_AUTHOR_NAME &&
3c730fab JK	186	git filter-branch -f --msg-filter "cat; \
8c1ce0f4	187	test \$GIT_COMMIT != $(git rev-parse master) \|\| \
f6b78c6e	188	echo Hallo" \
3c730fab	189	preserved-author) &&
a4d4e32a PK	190	git rev-list --author="B V Uips" preserved-author >actual &&
a4d4e32a PK	191	test_line_count = 1 actual
f6b78c6e JS	192	'
	193
	194	test_expect_success "remove a certain author's commits" '
	195	echo i > i &&
	196	test_tick &&
	197	git commit -m i i &&
dfd05e38	198	git branch removed-author &&
d592b315	199	git filter-branch -f --commit-filter "\
f6b78c6e JS	200	if [ \"\$GIT_AUTHOR_NAME\" = \"B V Uips\" ];\
f6b78c6e JS	201	then\
f95eef15	202	skip_commit \"\$@\";
f6b78c6e JS	203	else\
	204	git commit-tree \"\$@\";\
	205	fi" removed-author &&
	206	cnt1=$(git rev-list master \| wc -l) &&
	207	cnt2=$(git rev-list removed-author \| wc -l) &&
	208	test $cnt1 -eq $(($cnt2 + 1)) &&
a4d4e32a PK	209	git rev-list --author="B V Uips" removed-author >actual &&
a4d4e32a PK	210	test_line_count = 0 actual
f6b78c6e JS	211	'
f6b78c6e JS	212
dfd05e38	213	test_expect_success 'barf on invalid name' '
c8a08692 BC	214	test_must_fail git filter-branch -f master xy-problem &&
c8a08692 BC	215	test_must_fail git filter-branch -f HEAD^
dfd05e38 JS	216	'
dfd05e38 JS	217
7e0f1704 JS	218	test_expect_success '"map" works in commit filter' '
	219	git filter-branch -f --commit-filter "\
	220	parent=\$(git rev-parse \$GIT_COMMIT^) &&
	221	mapped=\$(map \$parent) &&
	222	actual=\$(echo \"\$@\" \| sed \"s/^.*-p //\") &&
	223	test \$mapped = \$actual &&
	224	git commit-tree \"\$@\";" master~2..master &&
	225	git rev-parse --verify master
	226	'
	227
1fe32cb9 JH	228	test_expect_success 'Name needing quotes' '
	229
	230	git checkout -b rerere A &&
	231	mkdir foo &&
	232	name="れれれ" &&
	233	>foo/$name &&
	234	git add foo &&
	235	git commit -m "Adding a file" &&
	236	git filter-branch --tree-filter "rm -fr foo" &&
c8a08692	237	test_must_fail git ls-files --error-unmatch "foo/$name" &&
1fe32cb9 JH	238	test $(git rev-parse --verify rerere) != $(git rev-parse --verify A)
	239
	240	'
	241
5b044ac3 JH	242	test_expect_success 'Subdirectory filter with disappearing trees' '
	243	git reset --hard &&
	244	git checkout master &&
	245
	246	mkdir foo &&
	247	touch foo/bar &&
	248	git add foo &&
	249	test_tick &&
	250	git commit -m "Adding foo" &&
	251
	252	git rm -r foo &&
	253	test_tick &&
	254	git commit -m "Removing foo" &&
	255
	256	mkdir foo &&
	257	touch foo/bar &&
	258	git add foo &&
	259	test_tick &&
	260	git commit -m "Re-adding foo" &&
	261
	262	git filter-branch -f --subdirectory-filter foo &&
a4d4e32a PK	263	git rev-list master >actual &&
a4d4e32a PK	264	test_line_count = 3 actual
5b044ac3 JH	265	'
5b044ac3 JH	266
1bf6551e BC	267	test_expect_success 'Tag name filtering retains tag message' '
	268	git tag -m atag T &&
	269	git cat-file tag T > expect &&
	270	git filter-branch -f --tag-name-filter cat &&
	271	git cat-file tag T > actual &&
3af82863	272	test_cmp expect actual
1bf6551e BC	273	'
	274
	275	faux_gpg_tag='object XXXXXX
	276	type commit
	277	tag S
	278	tagger T A Gger <tagger@example.com> 1206026339 -0500
	279
	280	This is a faux gpg signed tag.
	281	-----BEGIN PGP SIGNATURE-----
	282	Version: FauxGPG v0.0.0 (FAUX/Linux)
	283
	284	gdsfoewhxu/6l06f1kxyxhKdZkrcbaiOMtkJUA9ITAc1mlamh0ooasxkH1XwMbYQ
	285	acmwXaWET20H0GeAGP+7vow=
	286	=agpO
	287	-----END PGP SIGNATURE-----
	288	'
	289	test_expect_success 'Tag name filtering strips gpg signature' '
	290	sha1=$(git rev-parse HEAD) &&
	291	sha1t=$(echo "$faux_gpg_tag" \| sed -e s/XXXXXX/$sha1/ \| git mktag) &&
	292	git update-ref "refs/tags/S" "$sha1t" &&
	293	echo "$faux_gpg_tag" \| sed -e s/XXXXXX/$sha1/ \| head -n 6 > expect &&
	294	git filter-branch -f --tag-name-filter cat &&
	295	git cat-file tag S > actual &&
3af82863	296	test_cmp expect actual
1bf6551e BC	297	'
1bf6551e BC	298
a5a4b3ff JM	299	test_expect_success GPG 'Filtering retains message of gpg signed commit' '
	300	mkdir gpg &&
	301	touch gpg/foo &&
	302	git add gpg &&
	303	test_tick &&
	304	git commit -S -m "Adding gpg" &&
	305
	306	git log -1 --format="%s" > expect &&
	307	git filter-branch -f --msg-filter "cat" &&
	308	git log -1 --format="%s" > actual &&
	309	test_cmp expect actual
	310	'
	311
a9da1663 JS	312	test_expect_success 'Tag name filtering allows slashes in tag names' '
	313	git tag -m tag-with-slash X/1 &&
	314	git cat-file tag X/1 \| sed -e s,X/1,X/2, > expect &&
	315	git filter-branch -f --tag-name-filter "echo X/2" &&
	316	git cat-file tag X/2 > actual &&
	317	test_cmp expect actual
	318	'
377a3543 DP	319	test_expect_success 'setup --prune-empty comparisons' '
	320	git checkout --orphan master-no-a &&
	321	git rm -rf . &&
	322	unset test_tick &&
	323	test_tick &&
	324	GIT_COMMITTER_DATE="@0 +0000" GIT_AUTHOR_DATE="@0 +0000" &&
	325	test_commit --notick B B.t B Bx &&
	326	git checkout -b branch-no-a Bx &&
	327	test_commit D D.t D Dx &&
	328	mkdir dir &&
	329	test_commit dir/D dir/D.t dir/D dir/Dx &&
	330	test_commit E E.t E Ex &&
	331	git checkout master-no-a &&
	332	test_commit C C.t C Cx &&
	333	git checkout branch-no-a &&
	334	git merge Cx -m "Merge tag '\''C'\'' into branch" &&
	335	git tag Fx &&
	336	test_commit G G.t G Gx &&
	337	test_commit H H.t H Hx &&
	338	git checkout branch
	339	'
a9da1663	340
d3240d93 PH	341	test_expect_success 'Prune empty commits' '
d3240d93 PH	342	git rev-list HEAD > expect &&
77f2e4f5 BG	343	test_commit to_remove &&
77f2e4f5 BG	344	git filter-branch -f --index-filter "git update-index --remove to_remove.t" --prune-empty HEAD &&
d3240d93 PH	345	git rev-list HEAD > actual &&
	346	test_cmp expect actual
	347	'
	348
79bc4ef3 CB	349	test_expect_success 'prune empty collapsed merges' '
	350	test_config merge.ff false &&
	351	git rev-list HEAD >expect &&
	352	test_commit to_remove_2 &&
	353	git reset --hard HEAD^ &&
	354	test_merge non-ff to_remove_2 &&
	355	git filter-branch -f --index-filter "git update-index --remove to_remove_2.t" --prune-empty HEAD &&
	356	git rev-list HEAD >actual &&
	357	test_cmp expect actual
	358	'
	359
1dc413eb JK	360	test_expect_success 'prune empty works even without index/tree filters' '
	361	git rev-list HEAD >expect &&
	362	git commit --allow-empty -m empty &&
	363	git filter-branch -f --prune-empty HEAD &&
	364	git rev-list HEAD >actual &&
	365	test_cmp expect actual
	366	'
	367
a582a82d	368	test_expect_success '--prune-empty is able to prune root commit' '
377a3543 DP	369	git rev-list branch-no-a >expect &&
	370	git branch testing H &&
	371	git filter-branch -f --prune-empty --index-filter "git update-index --remove A.t" testing &&
	372	git rev-list testing >actual &&
	373	git branch -D testing &&
	374	test_cmp expect actual
	375	'
	376
a582a82d	377	test_expect_success '--prune-empty is able to prune entire branch' '
4dacc8f1 DP	378	git branch prune-entire B &&
	379	git filter-branch -f --prune-empty --index-filter "git update-index --remove A.t B.t" prune-entire &&
	380	test_path_is_missing .git/refs/heads/prune-entire &&
	381	test_must_fail git reflog exists refs/heads/prune-entire
	382	'
	383
f2f3a6b8 TR	384	test_expect_success '--remap-to-ancestor with filename filters' '
	385	git checkout master &&
	386	git reset --hard A &&
	387	test_commit add-foo foo 1 &&
	388	git branch moved-foo &&
	389	test_commit add-bar bar a &&
	390	git branch invariant &&
	391	orig_invariant=$(git rev-parse invariant) &&
	392	git branch moved-bar &&
	393	test_commit change-foo foo 2 &&
	394	git filter-branch -f --remap-to-ancestor \
	395	moved-foo moved-bar A..master \
	396	-- -- foo &&
	397	test $(git rev-parse moved-foo) = $(git rev-parse moved-bar) &&
	398	test $(git rev-parse moved-foo) = $(git rev-parse master^) &&
	399	test $orig_invariant = $(git rev-parse invariant)
	400	'
	401
7ec344d8 CH	402	test_expect_success 'automatic remapping to ancestor with filename filters' '
	403	git checkout master &&
	404	git reset --hard A &&
	405	test_commit add-foo2 foo 1 &&
	406	git branch moved-foo2 &&
	407	test_commit add-bar2 bar a &&
	408	git branch invariant2 &&
	409	orig_invariant=$(git rev-parse invariant2) &&
	410	git branch moved-bar2 &&
	411	test_commit change-foo2 foo 2 &&
	412	git filter-branch -f \
	413	moved-foo2 moved-bar2 A..master \
	414	-- -- foo &&
	415	test $(git rev-parse moved-foo2) = $(git rev-parse moved-bar2) &&
	416	test $(git rev-parse moved-foo2) = $(git rev-parse master^) &&
	417	test $orig_invariant = $(git rev-parse invariant2)
	418	'
	419
1f7d57ff MS	420	test_expect_success 'setup submodule' '
	421	rm -fr ?* .git &&
	422	git init &&
	423	test_commit file &&
	424	mkdir submod &&
	425	submodurl="$PWD/submod" &&
	426	( cd submod &&
	427	git init &&
	428	test_commit file-in-submod ) &&
	429	git submodule add "$submodurl" &&
	430	git commit -m "added submodule" &&
	431	test_commit add-file &&
	432	( cd submod && test_commit add-in-submodule ) &&
	433	git add submod &&
	434	git commit -m "changed submodule" &&
	435	git branch original HEAD
	436	'
	437
99485194	438	orig_head=$(git show-ref --hash --head HEAD)
1f7d57ff MS	439
	440	test_expect_success 'rewrite submodule with another content' '
	441	git filter-branch --tree-filter "test -d submod && {
	442	rm -rf submod &&
	443	git rm -rf --quiet submod &&
	444	mkdir submod &&
	445	: > submod/file
	446	} \|\| :" HEAD &&
99485194	447	test $orig_head != $(git show-ref --hash --head HEAD)
1f7d57ff MS	448	'
	449
	450	test_expect_success 'replace submodule revision' '
	451	git reset --hard original &&
	452	git filter-branch -f --tree-filter \
	453	"if git ls-files --error-unmatch -- submod > /dev/null 2>&1
	454	then git update-index --cacheinfo 160000 0123456789012345678901234567890123456789 submod
	455	fi" HEAD &&
99485194	456	test $orig_head != $(git show-ref --hash --head HEAD)
1f7d57ff MS	457	'
1f7d57ff MS	458
df062010 JK	459	test_expect_success 'filter commit message without trailing newline' '
	460	git reset --hard original &&
	461	commit=$(printf "no newline" \| git commit-tree HEAD^{tree}) &&
	462	git update-ref refs/heads/no-newline $commit &&
	463	git filter-branch -f refs/heads/no-newline &&
	464	echo $commit >expect &&
	465	git rev-parse refs/heads/no-newline >actual &&
	466	test_cmp expect actual
	467	'
	468
4d2a3646 SG	469	test_expect_success 'tree-filter deals with object name vs pathname ambiguity' '
	470	test_when_finished "git reset --hard original" &&
	471	ambiguous=$(git rev-list -1 HEAD) &&
	472	git filter-branch --tree-filter "mv file.t $ambiguous" HEAD^.. &&
	473	git show HEAD:$ambiguous
	474	'
	475
f78ab355 YK	476	test_expect_success 'rewrite repository including refs that point at non-commit object' '
	477	test_when_finished "git reset --hard original" &&
	478	tree=$(git rev-parse HEAD^{tree}) &&
	479	test_when_finished "git replace -d $tree" &&
	480	echo A >new &&
	481	git add new &&
	482	new_tree=$(git write-tree) &&
	483	git replace $tree $new_tree &&
	484	git tag -a -m "tag to a tree" treetag $new_tree &&
	485	git reset --hard HEAD &&
	486	git filter-branch -f -- --all >filter-output 2>&1 &&
	487	! fgrep fatal filter-output
	488	'
	489
6f6826c5	490	test_done