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

#!/bin/sh

test_description='git filter-branch'
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME

. ./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 main &&
	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
# |\
# | * (main) 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 &&
	! grep 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)"
'

V=$(git rev-parse HEAD)

test_expect_success 'populate --state-branch' '
	git filter-branch --state-branch state -f --tree-filter "touch file || :" HEAD
'

W=$(git rev-parse HEAD)

test_expect_success 'using --state-branch to skip already rewritten commits' '
	test_when_finished git reset --hard $V &&
	git reset --hard $V &&
	git filter-branch --state-branch state -f --tree-filter "touch file || :" HEAD &&
	test_cmp_rev $W HEAD
'

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 main &&
	mkdir subdir &&
	echo A > subdir/new &&
	git add subdir/new &&
	test_tick &&
	git commit -m "subdir on main" subdir/new &&
	git rm A.t &&
	test_tick &&
	git commit -m "again subdir on main" &&
	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 main) || \
			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 main | 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 main 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 \"\$@\";" main~2..main &&
	git rev-parse --verify main
'

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

	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 main >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 main-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 main-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_must_fail git rev-parse 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 main &&
	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..main \
		-- -- foo &&
	test $(git rev-parse moved-foo) = $(git rev-parse moved-bar) &&
	test $(git rev-parse moved-foo) = $(git rev-parse main^) &&
	test $orig_invariant = $(git rev-parse invariant)
'

test_expect_success 'automatic remapping to ancestor with filename filters' '
	git checkout main &&
	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..main \
		-- -- foo &&
	test $(git rev-parse moved-foo2) = $(git rev-parse moved-bar2) &&
	test $(git rev-parse moved-foo2) = $(git rev-parse main^) &&
	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' '
	invalid=$(test_oid numeric) &&
	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 $invalid 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 &&
	! grep fatal filter-output
'

test_expect_success 'filter-branch handles ref deletion' '
	git switch --orphan empty-commit &&
	git commit --allow-empty -m "empty commit" &&
	git tag empty &&
	git branch to-delete &&
	git filter-branch -f --prune-empty to-delete >out 2>&1 &&
	grep "to-delete.*was deleted" out &&
	test_must_fail git rev-parse --verify to-delete
'

test_expect_success 'filter-branch handles ref rewrite' '
	git checkout empty &&
	test_commit to-drop &&
	git branch rewrite &&
	git filter-branch -f \
		--index-filter "git rm --ignore-unmatch --cached to-drop.t" \
		 rewrite >out 2>&1 &&
	grep "rewrite.*was rewritten" out &&
	! grep -i warning out &&
	git diff-tree empty rewrite
'

test_expect_success 'filter-branch handles ancestor rewrite' '
	test_commit to-exclude &&
	git branch ancestor &&
	git filter-branch -f ancestor -- :^to-exclude.t >out 2>&1 &&
	grep "ancestor.*was rewritten" out &&
	! grep -i warning out &&
	git diff-tree HEAD^ ancestor
'

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