mirror of
https://github.com/git/git.git
synced 2024-11-01 23:07:55 +01:00
d3240d935c
git_commit_non_empty_tree is added to the functions that can be run from commit filters. Its effect is to commit only commits actually touching the tree and that are not merge points either. The option --prune-empty is added. It defaults the commit-filter to 'git_commit_non_empty_tree "$@"', and can be used with any other combination of filters, except --commit-hook that must used 'git_commit_non_empty_tree "$@"' where one puts 'git commit-tree "$@"' usually to achieve the same result. Signed-off-by: Pierre Habouzit <madcoder@debian.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
273 lines
6.9 KiB
Bash
Executable file
273 lines
6.9 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='git filter-branch'
|
|
. ./test-lib.sh
|
|
|
|
make_commit () {
|
|
lower=$(echo $1 | tr '[A-Z]' '[a-z]')
|
|
echo $lower > $lower
|
|
git add $lower
|
|
test_tick
|
|
git commit -m $1
|
|
git tag $1
|
|
}
|
|
|
|
test_expect_success 'setup' '
|
|
make_commit A
|
|
make_commit B
|
|
git checkout -b branch B
|
|
make_commit D
|
|
mkdir dir
|
|
make_commit dir/D
|
|
make_commit E
|
|
git checkout master
|
|
make_commit C
|
|
git checkout branch
|
|
git merge C
|
|
git tag F
|
|
make_commit G
|
|
make_commit H
|
|
'
|
|
|
|
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)
|
|
'
|
|
git config core.bare false
|
|
test_expect_success 'result is really identical' '
|
|
test $H = $(git rev-parse HEAD)
|
|
'
|
|
|
|
test_expect_success 'rewrite, renaming a specific file' '
|
|
git filter-branch -f --tree-filter "mv d doh || :" HEAD
|
|
'
|
|
|
|
test_expect_success 'test that the file was renamed' '
|
|
test d = "$(git show HEAD:doh --)" &&
|
|
! test -f d &&
|
|
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 --)" &&
|
|
! test -d dir &&
|
|
test -d diroh &&
|
|
! test -d diroh/dir &&
|
|
test -f diroh/d &&
|
|
test dir/d = "$(cat diroh/d)"
|
|
'
|
|
|
|
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 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 &&
|
|
test_tick &&
|
|
git commit -m "not subdir" a &&
|
|
echo A > subdir/new &&
|
|
test_tick &&
|
|
git commit -m "again subdir" subdir/new &&
|
|
git rm a &&
|
|
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 &&
|
|
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-\\t-&newsubdir/-\" |
|
|
GIT_INDEX_FILE=\$GIT_INDEX_FILE.new \
|
|
git update-index --index-info &&
|
|
mv \"\$GIT_INDEX_FILE.new\" \"\$GIT_INDEX_FILE\"" directorymoved &&
|
|
test -z "$(git diff 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 &&
|
|
make_commit to_remove &&
|
|
git filter-branch -f --index-filter "git update-index --remove to_remove" --prune-empty HEAD &&
|
|
git rev-list HEAD > actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_done
|