Andrew's git - gitweb.git/blob

a0ab096c8fdee153a89a1428f85c9bf107badada
   1#!/bin/sh
   2
   3test_description='git-filter-branch'
   4. ./test-lib.sh
   5
   6make_commit () {
   7        lower=$(echo $1 | tr '[A-Z]' '[a-z]')
   8        echo $lower > $lower
   9        git add $lower
  10        test_tick
  11        git commit -m $1
  12        git tag $1
  13}
  14
  15test_expect_success 'setup' '
  16        make_commit A
  17        make_commit B
  18        git checkout -b branch B
  19        make_commit D
  20        mkdir dir
  21        make_commit dir/D
  22        make_commit E
  23        git checkout master
  24        make_commit C
  25        git checkout branch
  26        git merge C
  27        git tag F
  28        make_commit G
  29        make_commit H
  30'
  31
  32H=$(git rev-parse H)
  33
  34test_expect_success 'rewrite identically' '
  35        git-filter-branch branch
  36'
  37test_expect_success 'result is really identical' '
  38        test $H = $(git rev-parse HEAD)
  39'
  40
  41test_expect_success 'rewrite bare repository identically' '
  42        (git config core.bare true && cd .git && git-filter-branch branch)
  43'
  44git config core.bare false
  45test_expect_success 'result is really identical' '
  46        test $H = $(git rev-parse HEAD)
  47'
  48
  49test_expect_success 'rewrite, renaming a specific file' '
  50        git-filter-branch -f --tree-filter "mv d doh || :" HEAD
  51'
  52
  53test_expect_success 'test that the file was renamed' '
  54        test d = "$(git show HEAD:doh --)" &&
  55        ! test -f d &&
  56        test -f doh &&
  57        test d = "$(cat doh)"
  58'
  59
  60test_expect_success 'rewrite, renaming a specific directory' '
  61        git-filter-branch -f --tree-filter "mv dir diroh || :" HEAD
  62'
  63
  64test_expect_success 'test that the directory was renamed' '
  65        test dir/d = "$(git show HEAD:diroh/d --)" &&
  66        ! test -d dir &&
  67        test -d diroh &&
  68        ! test -d diroh/dir &&
  69        test -f diroh/d &&
  70        test dir/d = "$(cat diroh/d)"
  71'
  72
  73git tag oldD HEAD~4
  74test_expect_success 'rewrite one branch, keeping a side branch' '
  75        git branch modD oldD &&
  76        git-filter-branch -f --tree-filter "mv b boh || :" D..modD
  77'
  78
  79test_expect_success 'common ancestor is still common (unchanged)' '
  80        test "$(git merge-base modD D)" = "$(git rev-parse B)"
  81'
  82
  83test_expect_success 'filter subdirectory only' '
  84        mkdir subdir &&
  85        touch subdir/new &&
  86        git add subdir/new &&
  87        test_tick &&
  88        git commit -m "subdir" &&
  89        echo H > a &&
  90        test_tick &&
  91        git commit -m "not subdir" a &&
  92        echo A > subdir/new &&
  93        test_tick &&
  94        git commit -m "again subdir" subdir/new &&
  95        git rm a &&
  96        test_tick &&
  97        git commit -m "again not subdir" &&
  98        git branch sub &&
  99        git-filter-branch -f --subdirectory-filter subdir refs/heads/sub
 100'
 101
 102test_expect_success 'subdirectory filter result looks okay' '
 103        test 2 = $(git rev-list sub | wc -l) &&
 104        git show sub:new &&
 105        test_must_fail git show sub:subdir
 106'
 107
 108test_expect_success 'more setup' '
 109        git checkout master &&
 110        mkdir subdir &&
 111        echo A > subdir/new &&
 112        git add subdir/new &&
 113        test_tick &&
 114        git commit -m "subdir on master" subdir/new &&
 115        git rm a &&
 116        test_tick &&
 117        git commit -m "again subdir on master" &&
 118        git merge branch
 119'
 120
 121test_expect_success 'use index-filter to move into a subdirectory' '
 122        git branch directorymoved &&
 123        git-filter-branch -f --index-filter \
 124                 "git ls-files -s | sed \"s-\\t-&newsubdir/-\" |
 125                  GIT_INDEX_FILE=\$GIT_INDEX_FILE.new \
 126                        git update-index --index-info &&
 127                  mv \"\$GIT_INDEX_FILE.new\" \"\$GIT_INDEX_FILE\"" directorymoved &&
 128        test -z "$(git diff HEAD directorymoved:newsubdir)"'
 129
 130test_expect_success 'stops when msg filter fails' '
 131        old=$(git rev-parse HEAD) &&
 132        test_must_fail git-filter-branch -f --msg-filter false HEAD &&
 133        test $old = $(git rev-parse HEAD) &&
 134        rm -rf .git-rewrite
 135'
 136
 137test_expect_success 'author information is preserved' '
 138        : > i &&
 139        git add i &&
 140        test_tick &&
 141        GIT_AUTHOR_NAME="B V Uips" git commit -m bvuips &&
 142        git branch preserved-author &&
 143        git-filter-branch -f --msg-filter "cat; \
 144                        test \$GIT_COMMIT != $(git rev-parse master) || \
 145                        echo Hallo" \
 146                preserved-author &&
 147        test 1 = $(git rev-list --author="B V Uips" preserved-author | wc -l)
 148'
 149
 150test_expect_success "remove a certain author's commits" '
 151        echo i > i &&
 152        test_tick &&
 153        git commit -m i i &&
 154        git branch removed-author &&
 155        git-filter-branch -f --commit-filter "\
 156                if [ \"\$GIT_AUTHOR_NAME\" = \"B V Uips\" ];\
 157                then\
 158                        skip_commit \"\$@\";
 159                else\
 160                        git commit-tree \"\$@\";\
 161                fi" removed-author &&
 162        cnt1=$(git rev-list master | wc -l) &&
 163        cnt2=$(git rev-list removed-author | wc -l) &&
 164        test $cnt1 -eq $(($cnt2 + 1)) &&
 165        test 0 = $(git rev-list --author="B V Uips" removed-author | wc -l)
 166'
 167
 168test_expect_success 'barf on invalid name' '
 169        test_must_fail git filter-branch -f master xy-problem &&
 170        test_must_fail git filter-branch -f HEAD^
 171'
 172
 173test_expect_success '"map" works in commit filter' '
 174        git filter-branch -f --commit-filter "\
 175                parent=\$(git rev-parse \$GIT_COMMIT^) &&
 176                mapped=\$(map \$parent) &&
 177                actual=\$(echo \"\$@\" | sed \"s/^.*-p //\") &&
 178                test \$mapped = \$actual &&
 179                git commit-tree \"\$@\";" master~2..master &&
 180        git rev-parse --verify master
 181'
 182
 183test_expect_success 'Name needing quotes' '
 184
 185        git checkout -b rerere A &&
 186        mkdir foo &&
 187        name="れれれ" &&
 188        >foo/$name &&
 189        git add foo &&
 190        git commit -m "Adding a file" &&
 191        git filter-branch --tree-filter "rm -fr foo" &&
 192        test_must_fail git ls-files --error-unmatch "foo/$name" &&
 193        test $(git rev-parse --verify rerere) != $(git rev-parse --verify A)
 194
 195'
 196
 197test_expect_success 'Subdirectory filter with disappearing trees' '
 198        git reset --hard &&
 199        git checkout master &&
 200
 201        mkdir foo &&
 202        touch foo/bar &&
 203        git add foo &&
 204        test_tick &&
 205        git commit -m "Adding foo" &&
 206
 207        git rm -r foo &&
 208        test_tick &&
 209        git commit -m "Removing foo" &&
 210
 211        mkdir foo &&
 212        touch foo/bar &&
 213        git add foo &&
 214        test_tick &&
 215        git commit -m "Re-adding foo" &&
 216
 217        git filter-branch -f --subdirectory-filter foo &&
 218        test $(git rev-list master | wc -l) = 3
 219'
 220
 221test_expect_success 'Tag name filtering retains tag message' '
 222        git tag -m atag T &&
 223        git cat-file tag T > expect &&
 224        git filter-branch -f --tag-name-filter cat &&
 225        git cat-file tag T > actual &&
 226        test_cmp expect actual
 227'
 228
 229faux_gpg_tag='object XXXXXX
 230type commit
 231tag S
 232tagger T A Gger <tagger@example.com> 1206026339 -0500
 233
 234This is a faux gpg signed tag.
 235-----BEGIN PGP SIGNATURE-----
 236Version: FauxGPG v0.0.0 (FAUX/Linux)
 237
 238gdsfoewhxu/6l06f1kxyxhKdZkrcbaiOMtkJUA9ITAc1mlamh0ooasxkH1XwMbYQ
 239acmwXaWET20H0GeAGP+7vow=
 240=agpO
 241-----END PGP SIGNATURE-----
 242'
 243test_expect_success 'Tag name filtering strips gpg signature' '
 244        sha1=$(git rev-parse HEAD) &&
 245        sha1t=$(echo "$faux_gpg_tag" | sed -e s/XXXXXX/$sha1/ | git mktag) &&
 246        git update-ref "refs/tags/S" "$sha1t" &&
 247        echo "$faux_gpg_tag" | sed -e s/XXXXXX/$sha1/ | head -n 6 > expect &&
 248        git filter-branch -f --tag-name-filter cat &&
 249        git cat-file tag S > actual &&
 250        test_cmp expect actual
 251'
 252
 253test_done