2007-06-03 02:31:28 +02:00
|
|
|
#!/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
|
2007-06-05 09:07:31 +02:00
|
|
|
test_tick
|
2007-06-03 02:31:28 +02: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
|
|
|
|
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 H2
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'result is really identical' '
|
|
|
|
test $H = $(git-rev-parse H2)
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'rewrite, renaming a specific file' '
|
|
|
|
git-filter-branch --tree-filter "mv d doh || :" H3
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'test that the file was renamed' '
|
|
|
|
test d = $(git show H3:doh)
|
|
|
|
'
|
|
|
|
|
2007-06-05 17:58:13 +02:00
|
|
|
git tag oldD H3~4
|
|
|
|
test_expect_success 'rewrite one branch, keeping a side branch' '
|
|
|
|
git-filter-branch --tree-filter "mv b boh || :" -k D -s oldD modD
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'common ancestor is still common (unchanged)' '
|
|
|
|
test "$(git-merge-base modD D)" = "$(git-rev-parse B)"
|
|
|
|
'
|
|
|
|
|
2007-06-03 02:31:28 +02:00
|
|
|
test_done
|