2007-06-03 00:31:28 +00:00
|
|
|
#!/bin/sh
|
|
|
|
|
2008-09-03 08:59:31 +00:00
|
|
|
test_description='git filter-branch'
|
2007-06-03 00:31:28 +00:00
|
|
|
. ./test-lib.sh
|
|
|
|
|
|
|
|
make_commit () {
|
tr portability fixes
Specifying character ranges in tr differs between System V
and POSIX. In System V, brackets are required (e.g.,
'[A-Z]'), whereas in POSIX they are not.
We can mostly get around this by just using the bracket form
for both sets, as in:
tr '[A-Z] '[a-z]'
in which case POSIX interpets this as "'[' becomes '['",
which is OK.
However, this doesn't work with multiple sequences, like:
# rot13
tr '[A-Z][a-z]' '[N-Z][A-M][n-z][a-m]'
where the POSIX version does not behave the same as the
System V version. In this case, we must simply enumerate the
sequence.
This patch fixes problematic uses of tr in git scripts and
test scripts in one of three ways:
- if a single sequence, make sure it uses brackets
- if multiple sequences, enumerate
- if extra brackets (e.g., tr '[A]' 'a'), eliminate
brackets
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-03-12 21:29:57 +00:00
|
|
|
lower=$(echo $1 | tr '[A-Z]' '[a-z]')
|
2007-06-03 00:31:28 +00:00
|
|
|
echo $lower > $lower
|
|
|
|
git add $lower
|
2007-06-05 07:07:31 +00:00
|
|
|
test_tick
|
2007-06-03 00:31:28 +00:00
|
|
|
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
|
2008-03-31 07:14:14 +00:00
|
|
|
mkdir dir
|
|
|
|
make_commit dir/D
|
2007-06-03 00:31:28 +00:00
|
|
|
make_commit E
|
|
|
|
git checkout master
|
|
|
|
make_commit C
|
|
|
|
git checkout branch
|
|
|
|
git merge C
|
|
|
|
git tag F
|
|
|
|
make_commit G
|
|
|
|
make_commit H
|
|
|
|
'
|
|
|
|
|
2007-07-03 05:52:14 +00:00
|
|
|
H=$(git rev-parse H)
|
2007-06-03 00:31:28 +00:00
|
|
|
|
|
|
|
test_expect_success 'rewrite identically' '
|
2008-09-03 08:59:31 +00:00
|
|
|
git filter-branch branch
|
2007-06-03 00:31:28 +00:00
|
|
|
'
|
|
|
|
test_expect_success 'result is really identical' '
|
2007-07-23 17:34:13 +00:00
|
|
|
test $H = $(git rev-parse HEAD)
|
2007-06-03 00:31:28 +00:00
|
|
|
'
|
|
|
|
|
2008-07-23 22:15:36 +00:00
|
|
|
test_expect_success 'rewrite bare repository identically' '
|
2009-02-03 18:27:03 +00:00
|
|
|
(git config core.bare true && cd .git &&
|
|
|
|
git filter-branch branch > filter-output 2>&1 &&
|
|
|
|
! fgrep fatal filter-output)
|
2008-07-23 22:15:36 +00:00
|
|
|
'
|
|
|
|
git config core.bare false
|
|
|
|
test_expect_success 'result is really identical' '
|
|
|
|
test $H = $(git rev-parse HEAD)
|
|
|
|
'
|
|
|
|
|
2009-02-18 08:35:36 +00:00
|
|
|
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"
|
|
|
|
'
|
|
|
|
|
2009-02-11 21:10:41 +00:00
|
|
|
test_expect_success 'Fail if commit filter fails' '
|
|
|
|
test_must_fail git filter-branch -f --commit-filter "exit 1" HEAD
|
|
|
|
'
|
|
|
|
|
2007-06-03 00:31:28 +00:00
|
|
|
test_expect_success 'rewrite, renaming a specific file' '
|
2008-09-03 08:59:31 +00:00
|
|
|
git filter-branch -f --tree-filter "mv d doh || :" HEAD
|
2007-06-03 00:31:28 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'test that the file was renamed' '
|
2008-03-31 07:14:14 +00:00
|
|
|
test d = "$(git show HEAD:doh --)" &&
|
|
|
|
! test -f d &&
|
2007-10-17 02:23:10 +00:00
|
|
|
test -f doh &&
|
2008-03-31 07:14:14 +00:00
|
|
|
test d = "$(cat doh)"
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'rewrite, renaming a specific directory' '
|
2008-09-03 08:59:31 +00:00
|
|
|
git filter-branch -f --tree-filter "mv dir diroh || :" HEAD
|
2008-03-31 07:14:14 +00:00
|
|
|
'
|
|
|
|
|
2008-03-31 07:14:15 +00:00
|
|
|
test_expect_success 'test that the directory was renamed' '
|
2008-03-31 07:14:14 +00:00
|
|
|
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)"
|
2007-06-03 00:31:28 +00:00
|
|
|
'
|
|
|
|
|
2007-07-23 17:34:13 +00:00
|
|
|
git tag oldD HEAD~4
|
2007-06-05 15:58:13 +00:00
|
|
|
test_expect_success 'rewrite one branch, keeping a side branch' '
|
2007-07-23 17:34:13 +00:00
|
|
|
git branch modD oldD &&
|
2008-09-03 08:59:31 +00:00
|
|
|
git filter-branch -f --tree-filter "mv b boh || :" D..modD
|
2007-06-05 15:58:13 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'common ancestor is still common (unchanged)' '
|
2007-07-03 05:52:14 +00:00
|
|
|
test "$(git merge-base modD D)" = "$(git rev-parse B)"
|
2007-06-05 15:58:13 +00:00
|
|
|
'
|
|
|
|
|
2007-06-08 00:30:35 +00:00
|
|
|
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" &&
|
2007-07-23 17:34:13 +00:00
|
|
|
git branch sub &&
|
2008-08-12 08:45:57 +00:00
|
|
|
git branch sub-earlier HEAD~2 &&
|
2008-09-03 23:08:23 +00:00
|
|
|
git filter-branch -f --subdirectory-filter subdir \
|
2008-08-12 08:45:57 +00:00
|
|
|
refs/heads/sub refs/heads/sub-earlier
|
2007-06-08 00:30:35 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'subdirectory filter result looks okay' '
|
2007-07-03 05:52:14 +00:00
|
|
|
test 2 = $(git rev-list sub | wc -l) &&
|
2007-06-08 00:30:35 +00:00
|
|
|
git show sub:new &&
|
2008-08-12 08:45:57 +00:00
|
|
|
test_must_fail git show sub:subdir &&
|
|
|
|
git show sub-earlier:new &&
|
|
|
|
test_must_fail git show sub-earlier:subdir
|
2007-06-08 00:30:35 +00:00
|
|
|
'
|
|
|
|
|
2008-05-26 19:09:18 +00:00
|
|
|
test_expect_success 'more setup' '
|
2007-06-08 21:28:50 +00:00
|
|
|
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" &&
|
2008-05-26 19:09:18 +00:00
|
|
|
git merge branch
|
2007-06-08 21:28:50 +00:00
|
|
|
'
|
|
|
|
|
2007-06-21 17:05:30 +00:00
|
|
|
test_expect_success 'use index-filter to move into a subdirectory' '
|
2007-07-23 17:34:13 +00:00
|
|
|
git branch directorymoved &&
|
2008-09-03 08:59:31 +00:00
|
|
|
git filter-branch -f --index-filter \
|
2007-07-03 05:52:14 +00:00
|
|
|
"git ls-files -s | sed \"s-\\t-&newsubdir/-\" |
|
2007-06-21 17:05:30 +00:00
|
|
|
GIT_INDEX_FILE=\$GIT_INDEX_FILE.new \
|
2007-07-03 05:52:14 +00:00
|
|
|
git update-index --index-info &&
|
2008-05-04 05:37:59 +00:00
|
|
|
mv \"\$GIT_INDEX_FILE.new\" \"\$GIT_INDEX_FILE\"" directorymoved &&
|
2007-06-21 17:05:30 +00:00
|
|
|
test -z "$(git diff HEAD directorymoved:newsubdir)"'
|
|
|
|
|
filter-branch: fail gracefully when a filter fails
A common mistake is to provide a filter which fails unwantedly. For
example, this will stop in the middle:
git filter-branch --env-filter '
test $GIT_COMMITTER_EMAIL = xyz &&
export GIT_COMMITTER_EMAIL = abc' rewritten
When $GIT_COMMITTER_EMAIL is not "xyz", the test fails, and consequently
the whole filter has a non-zero exit status. However, as demonstrated
in this example, filter-branch would just stop, and the user would be
none the wiser.
Also, a failing msg-filter would not have been caught, as was the
case with one of the tests.
This patch fixes both issues, by paying attention to the exit status
of msg-filter, and by saying what failed before exiting.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2007-07-04 14:36:01 +00:00
|
|
|
test_expect_success 'stops when msg filter fails' '
|
2007-07-23 17:34:13 +00:00
|
|
|
old=$(git rev-parse HEAD) &&
|
2008-09-03 08:59:31 +00:00
|
|
|
test_must_fail git filter-branch -f --msg-filter false HEAD &&
|
2007-07-23 17:34:13 +00:00
|
|
|
test $old = $(git rev-parse HEAD) &&
|
|
|
|
rm -rf .git-rewrite
|
filter-branch: fail gracefully when a filter fails
A common mistake is to provide a filter which fails unwantedly. For
example, this will stop in the middle:
git filter-branch --env-filter '
test $GIT_COMMITTER_EMAIL = xyz &&
export GIT_COMMITTER_EMAIL = abc' rewritten
When $GIT_COMMITTER_EMAIL is not "xyz", the test fails, and consequently
the whole filter has a non-zero exit status. However, as demonstrated
in this example, filter-branch would just stop, and the user would be
none the wiser.
Also, a failing msg-filter would not have been caught, as was the
case with one of the tests.
This patch fixes both issues, by paying attention to the exit status
of msg-filter, and by saying what failed before exiting.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2007-07-04 14:36:01 +00:00
|
|
|
'
|
|
|
|
|
2007-07-03 16:50:19 +00:00
|
|
|
test_expect_success 'author information is preserved' '
|
|
|
|
: > i &&
|
|
|
|
git add i &&
|
|
|
|
test_tick &&
|
|
|
|
GIT_AUTHOR_NAME="B V Uips" git commit -m bvuips &&
|
2007-07-23 17:34:13 +00:00
|
|
|
git branch preserved-author &&
|
2008-09-03 08:59:31 +00:00
|
|
|
git filter-branch -f --msg-filter "cat; \
|
filter-branch: fail gracefully when a filter fails
A common mistake is to provide a filter which fails unwantedly. For
example, this will stop in the middle:
git filter-branch --env-filter '
test $GIT_COMMITTER_EMAIL = xyz &&
export GIT_COMMITTER_EMAIL = abc' rewritten
When $GIT_COMMITTER_EMAIL is not "xyz", the test fails, and consequently
the whole filter has a non-zero exit status. However, as demonstrated
in this example, filter-branch would just stop, and the user would be
none the wiser.
Also, a failing msg-filter would not have been caught, as was the
case with one of the tests.
This patch fixes both issues, by paying attention to the exit status
of msg-filter, and by saying what failed before exiting.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2007-07-04 14:36:01 +00:00
|
|
|
test \$GIT_COMMIT != $(git rev-parse master) || \
|
2007-07-03 16:50:19 +00:00
|
|
|
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 &&
|
2007-07-23 17:34:13 +00:00
|
|
|
git branch removed-author &&
|
2008-09-03 08:59:31 +00:00
|
|
|
git filter-branch -f --commit-filter "\
|
2007-07-03 16:50:19 +00:00
|
|
|
if [ \"\$GIT_AUTHOR_NAME\" = \"B V Uips\" ];\
|
|
|
|
then\
|
2007-08-31 19:06:27 +00:00
|
|
|
skip_commit \"\$@\";
|
2007-07-03 16:50:19 +00:00
|
|
|
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)
|
|
|
|
'
|
|
|
|
|
2007-07-23 17:34:13 +00:00
|
|
|
test_expect_success 'barf on invalid name' '
|
2008-03-20 16:54:30 +00:00
|
|
|
test_must_fail git filter-branch -f master xy-problem &&
|
|
|
|
test_must_fail git filter-branch -f HEAD^
|
2007-07-23 17:34:13 +00:00
|
|
|
'
|
|
|
|
|
2007-08-31 19:05:36 +00:00
|
|
|
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
|
|
|
|
'
|
|
|
|
|
2008-02-16 07:57:26 +00:00
|
|
|
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" &&
|
2008-03-20 16:54:30 +00:00
|
|
|
test_must_fail git ls-files --error-unmatch "foo/$name" &&
|
2008-02-16 07:57:26 +00:00
|
|
|
test $(git rev-parse --verify rerere) != $(git rev-parse --verify A)
|
|
|
|
|
|
|
|
'
|
|
|
|
|
2008-03-08 20:25:58 +00:00
|
|
|
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
|
|
|
|
'
|
|
|
|
|
2008-03-26 15:47:09 +00:00
|
|
|
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 &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual
|
2008-03-26 15:47:09 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
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 &&
|
2008-05-24 05:28:56 +00:00
|
|
|
test_cmp expect actual
|
2008-03-26 15:47:09 +00:00
|
|
|
'
|
|
|
|
|
2008-08-21 14:45:11 +00:00
|
|
|
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
|
|
|
|
'
|
|
|
|
|
2008-10-31 09:12:21 +00:00
|
|
|
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
|
|
|
|
'
|
|
|
|
|
2007-06-03 00:31:28 +00:00
|
|
|
test_done
|