Andrew's git - gitweb.git/blob - t/t7003-filter-branch.sh

   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 &&
  43         git filter-branch branch > filter-output 2>&1 &&
  44        ! fgrep fatal filter-output)
  45'
  46git config core.bare false
  47test_expect_success 'result is really identical' '
  48        test $H = $(git rev-parse HEAD)
  49'
  50
  51TRASHDIR=$(pwd)
  52test_expect_success 'correct GIT_DIR while using -d' '
  53        mkdir drepo &&
  54        ( cd drepo &&
  55        git init &&
  56        test_commit drepo &&
  57        git filter-branch -d "$TRASHDIR/dfoo" \
  58                --index-filter "cp \"$TRASHDIR\"/dfoo/backup-refs \"$TRASHDIR\"" \
  59        ) &&
  60        grep drepo "$TRASHDIR/backup-refs"
  61'
  62
  63test_expect_success 'Fail if commit filter fails' '
  64        test_must_fail git filter-branch -f --commit-filter "exit 1" HEAD
  65'
  66
  67test_expect_success 'rewrite, renaming a specific file' '
  68        git filter-branch -f --tree-filter "mv d doh || :" HEAD
  69'
  70
  71test_expect_success 'test that the file was renamed' '
  72        test d = "$(git show HEAD:doh --)" &&
  73        ! test -f d &&
  74        test -f doh &&
  75        test d = "$(cat doh)"
  76'
  77
  78test_expect_success 'rewrite, renaming a specific directory' '
  79        git filter-branch -f --tree-filter "mv dir diroh || :" HEAD
  80'
  81
  82test_expect_success 'test that the directory was renamed' '
  83        test dir/d = "$(git show HEAD:diroh/d --)" &&
  84        ! test -d dir &&
  85        test -d diroh &&
  86        ! test -d diroh/dir &&
  87        test -f diroh/d &&
  88        test dir/d = "$(cat diroh/d)"
  89'
  90
  91git tag oldD HEAD~4
  92test_expect_success 'rewrite one branch, keeping a side branch' '
  93        git branch modD oldD &&
  94        git filter-branch -f --tree-filter "mv b boh || :" D..modD
  95'
  96
  97test_expect_success 'common ancestor is still common (unchanged)' '
  98        test "$(git merge-base modD D)" = "$(git rev-parse B)"
  99'
 100
 101test_expect_success 'filter subdirectory only' '
 102        mkdir subdir &&
 103        touch subdir/new &&
 104        git add subdir/new &&
 105        test_tick &&
 106        git commit -m "subdir" &&
 107        echo H > a &&
 108        test_tick &&
 109        git commit -m "not subdir" a &&
 110        echo A > subdir/new &&
 111        test_tick &&
 112        git commit -m "again subdir" subdir/new &&
 113        git rm a &&
 114        test_tick &&
 115        git commit -m "again not subdir" &&
 116        git branch sub &&
 117        git branch sub-earlier HEAD~2 &&
 118        git filter-branch -f --subdirectory-filter subdir \
 119                refs/heads/sub refs/heads/sub-earlier
 120'
 121
 122test_expect_success 'subdirectory filter result looks okay' '
 123        test 2 = $(git rev-list sub | wc -l) &&
 124        git show sub:new &&
 125        test_must_fail git show sub:subdir &&
 126        git show sub-earlier:new &&
 127        test_must_fail git show sub-earlier:subdir
 128'
 129
 130test_expect_success 'more setup' '
 131        git checkout master &&
 132        mkdir subdir &&
 133        echo A > subdir/new &&
 134        git add subdir/new &&
 135        test_tick &&
 136        git commit -m "subdir on master" subdir/new &&
 137        git rm a &&
 138        test_tick &&
 139        git commit -m "again subdir on master" &&
 140        git merge branch
 141'
 142
 143test_expect_success 'use index-filter to move into a subdirectory' '
 144        git branch directorymoved &&
 145        git filter-branch -f --index-filter \
 146                 "git ls-files -s | sed \"s-\\t-&newsubdir/-\" |
 147                  GIT_INDEX_FILE=\$GIT_INDEX_FILE.new \
 148                        git update-index --index-info &&
 149                  mv \"\$GIT_INDEX_FILE.new\" \"\$GIT_INDEX_FILE\"" directorymoved &&
 150        test -z "$(git diff HEAD directorymoved:newsubdir)"'
 151
 152test_expect_success 'stops when msg filter fails' '
 153        old=$(git rev-parse HEAD) &&
 154        test_must_fail git filter-branch -f --msg-filter false HEAD &&
 155        test $old = $(git rev-parse HEAD) &&
 156        rm -rf .git-rewrite
 157'
 158
 159test_expect_success 'author information is preserved' '
 160        : > i &&
 161        git add i &&
 162        test_tick &&
 163        GIT_AUTHOR_NAME="B V Uips" git commit -m bvuips &&
 164        git branch preserved-author &&
 165        git filter-branch -f --msg-filter "cat; \
 166                        test \$GIT_COMMIT != $(git rev-parse master) || \
 167                        echo Hallo" \
 168                preserved-author &&
 169        test 1 = $(git rev-list --author="B V Uips" preserved-author | wc -l)
 170'
 171
 172test_expect_success "remove a certain author's commits" '
 173        echo i > i &&
 174        test_tick &&
 175        git commit -m i i &&
 176        git branch removed-author &&
 177        git filter-branch -f --commit-filter "\
 178                if [ \"\$GIT_AUTHOR_NAME\" = \"B V Uips\" ];\
 179                then\
 180                        skip_commit \"\$@\";
 181                else\
 182                        git commit-tree \"\$@\";\
 183                fi" removed-author &&
 184        cnt1=$(git rev-list master | wc -l) &&
 185        cnt2=$(git rev-list removed-author | wc -l) &&
 186        test $cnt1 -eq $(($cnt2 + 1)) &&
 187        test 0 = $(git rev-list --author="B V Uips" removed-author | wc -l)
 188'
 189
 190test_expect_success 'barf on invalid name' '
 191        test_must_fail git filter-branch -f master xy-problem &&
 192        test_must_fail git filter-branch -f HEAD^
 193'
 194
 195test_expect_success '"map" works in commit filter' '
 196        git filter-branch -f --commit-filter "\
 197                parent=\$(git rev-parse \$GIT_COMMIT^) &&
 198                mapped=\$(map \$parent) &&
 199                actual=\$(echo \"\$@\" | sed \"s/^.*-p //\") &&
 200                test \$mapped = \$actual &&
 201                git commit-tree \"\$@\";" master~2..master &&
 202        git rev-parse --verify master
 203'
 204
 205test_expect_success 'Name needing quotes' '
 206
 207        git checkout -b rerere A &&
 208        mkdir foo &&
 209        name="れれれ" &&
 210        >foo/$name &&
 211        git add foo &&
 212        git commit -m "Adding a file" &&
 213        git filter-branch --tree-filter "rm -fr foo" &&
 214        test_must_fail git ls-files --error-unmatch "foo/$name" &&
 215        test $(git rev-parse --verify rerere) != $(git rev-parse --verify A)
 216
 217'
 218
 219test_expect_success 'Subdirectory filter with disappearing trees' '
 220        git reset --hard &&
 221        git checkout master &&
 222
 223        mkdir foo &&
 224        touch foo/bar &&
 225        git add foo &&
 226        test_tick &&
 227        git commit -m "Adding foo" &&
 228
 229        git rm -r foo &&
 230        test_tick &&
 231        git commit -m "Removing foo" &&
 232
 233        mkdir foo &&
 234        touch foo/bar &&
 235        git add foo &&
 236        test_tick &&
 237        git commit -m "Re-adding foo" &&
 238
 239        git filter-branch -f --subdirectory-filter foo &&
 240        test $(git rev-list master | wc -l) = 3
 241'
 242
 243test_expect_success 'Tag name filtering retains tag message' '
 244        git tag -m atag T &&
 245        git cat-file tag T > expect &&
 246        git filter-branch -f --tag-name-filter cat &&
 247        git cat-file tag T > actual &&
 248        test_cmp expect actual
 249'
 250
 251faux_gpg_tag='object XXXXXX
 252type commit
 253tag S
 254tagger T A Gger <tagger@example.com> 1206026339 -0500
 255
 256This is a faux gpg signed tag.
 257-----BEGIN PGP SIGNATURE-----
 258Version: FauxGPG v0.0.0 (FAUX/Linux)
 259
 260gdsfoewhxu/6l06f1kxyxhKdZkrcbaiOMtkJUA9ITAc1mlamh0ooasxkH1XwMbYQ
 261acmwXaWET20H0GeAGP+7vow=
 262=agpO
 263-----END PGP SIGNATURE-----
 264'
 265test_expect_success 'Tag name filtering strips gpg signature' '
 266        sha1=$(git rev-parse HEAD) &&
 267        sha1t=$(echo "$faux_gpg_tag" | sed -e s/XXXXXX/$sha1/ | git mktag) &&
 268        git update-ref "refs/tags/S" "$sha1t" &&
 269        echo "$faux_gpg_tag" | sed -e s/XXXXXX/$sha1/ | head -n 6 > expect &&
 270        git filter-branch -f --tag-name-filter cat &&
 271        git cat-file tag S > actual &&
 272        test_cmp expect actual
 273'
 274
 275test_expect_success 'Tag name filtering allows slashes in tag names' '
 276        git tag -m tag-with-slash X/1 &&
 277        git cat-file tag X/1 | sed -e s,X/1,X/2, > expect &&
 278        git filter-branch -f --tag-name-filter "echo X/2" &&
 279        git cat-file tag X/2 > actual &&
 280        test_cmp expect actual
 281'
 282
 283test_expect_success 'Prune empty commits' '
 284        git rev-list HEAD > expect &&
 285        make_commit to_remove &&
 286        git filter-branch -f --index-filter "git update-index --remove to_remove" --prune-empty HEAD &&
 287        git rev-list HEAD > actual &&
 288        test_cmp expect actual
 289'
 290
 291test_expect_success '--remap-to-ancestor with filename filters' '
 292        git checkout master &&
 293        git reset --hard A &&
 294        test_commit add-foo foo 1 &&
 295        git branch moved-foo &&
 296        test_commit add-bar bar a &&
 297        git branch invariant &&
 298        orig_invariant=$(git rev-parse invariant) &&
 299        git branch moved-bar &&
 300        test_commit change-foo foo 2 &&
 301        git filter-branch -f --remap-to-ancestor \
 302                moved-foo moved-bar A..master \
 303                -- -- foo &&
 304        test $(git rev-parse moved-foo) = $(git rev-parse moved-bar) &&
 305        test $(git rev-parse moved-foo) = $(git rev-parse master^) &&
 306        test $orig_invariant = $(git rev-parse invariant)
 307'
 308
 309test_expect_success 'setup submodule' '
 310        rm -fr ?* .git &&
 311        git init &&
 312        test_commit file &&
 313        mkdir submod &&
 314        submodurl="$PWD/submod" &&
 315        ( cd submod &&
 316          git init &&
 317          test_commit file-in-submod ) &&
 318        git submodule add "$submodurl" &&
 319        git commit -m "added submodule" &&
 320        test_commit add-file &&
 321        ( cd submod && test_commit add-in-submodule ) &&
 322        git add submod &&
 323        git commit -m "changed submodule" &&
 324        git branch original HEAD
 325'
 326
 327orig_head=`git show-ref --hash --head HEAD`
 328
 329test_expect_success 'rewrite submodule with another content' '
 330        git filter-branch --tree-filter "test -d submod && {
 331                                         rm -rf submod &&
 332                                         git rm -rf --quiet submod &&
 333                                         mkdir submod &&
 334                                         : > submod/file
 335                                         } || :" HEAD &&
 336        test $orig_head != `git show-ref --hash --head HEAD`
 337'
 338
 339test_expect_success 'replace submodule revision' '
 340        git reset --hard original &&
 341        git filter-branch -f --tree-filter \
 342            "if git ls-files --error-unmatch -- submod > /dev/null 2>&1
 343             then git update-index --cacheinfo 160000 0123456789012345678901234567890123456789 submod
 344             fi" HEAD &&
 345        test $orig_head != `git show-ref --hash --head HEAD`
 346'
 347
 348test_done