t / t9350-fast-export.shon commit t: fix severe &&-chain breakage (8fb2687)
   1#!/bin/sh
   2#
   3# Copyright (c) 2007 Johannes E. Schindelin
   4#
   5
   6test_description='git fast-export'
   7. ./test-lib.sh
   8
   9test_expect_success 'setup' '
  10
  11        echo break it > file0 &&
  12        git add file0 &&
  13        test_tick &&
  14        echo Wohlauf > file &&
  15        git add file &&
  16        test_tick &&
  17        git commit -m initial &&
  18        echo die Luft > file &&
  19        echo geht frisch > file2 &&
  20        git add file file2 &&
  21        test_tick &&
  22        git commit -m second &&
  23        echo und > file2 &&
  24        test_tick &&
  25        git commit -m third file2 &&
  26        test_tick &&
  27        git tag rein &&
  28        git checkout -b wer HEAD^ &&
  29        echo lange > file2 &&
  30        test_tick &&
  31        git commit -m sitzt file2 &&
  32        test_tick &&
  33        git tag -a -m valentin muss &&
  34        git merge -s ours master
  35
  36'
  37
  38test_expect_success 'fast-export | fast-import' '
  39
  40        MASTER=$(git rev-parse --verify master) &&
  41        REIN=$(git rev-parse --verify rein) &&
  42        WER=$(git rev-parse --verify wer) &&
  43        MUSS=$(git rev-parse --verify muss) &&
  44        mkdir new &&
  45        git --git-dir=new/.git init &&
  46        git fast-export --all |
  47        (cd new &&
  48         git fast-import &&
  49         test $MASTER = $(git rev-parse --verify refs/heads/master) &&
  50         test $REIN = $(git rev-parse --verify refs/tags/rein) &&
  51         test $WER = $(git rev-parse --verify refs/heads/wer) &&
  52         test $MUSS = $(git rev-parse --verify refs/tags/muss))
  53
  54'
  55
  56test_expect_success 'fast-export master~2..master' '
  57
  58        git fast-export master~2..master |
  59                sed "s/master/partial/" |
  60                (cd new &&
  61                 git fast-import &&
  62                 test $MASTER != $(git rev-parse --verify refs/heads/partial) &&
  63                 git diff --exit-code master partial &&
  64                 git diff --exit-code master^ partial^ &&
  65                 test_must_fail git rev-parse partial~2)
  66
  67'
  68
  69test_expect_success 'iso-8859-1' '
  70
  71        git config i18n.commitencoding ISO8859-1 &&
  72        # use author and committer name in ISO-8859-1 to match it.
  73        . "$TEST_DIRECTORY"/t3901-8859-1.txt &&
  74        test_tick &&
  75        echo rosten >file &&
  76        git commit -s -m den file &&
  77        git fast-export wer^..wer |
  78                sed "s/wer/i18n/" |
  79                (cd new &&
  80                 git fast-import &&
  81                 git cat-file commit i18n | grep "Áéí óú")
  82
  83'
  84test_expect_success 'import/export-marks' '
  85
  86        git checkout -b marks master &&
  87        git fast-export --export-marks=tmp-marks HEAD &&
  88        test -s tmp-marks &&
  89        test_line_count = 3 tmp-marks &&
  90        test $(
  91                git fast-export --import-marks=tmp-marks\
  92                --export-marks=tmp-marks HEAD |
  93                grep ^commit |
  94                wc -l) \
  95        -eq 0 &&
  96        echo change > file &&
  97        git commit -m "last commit" file &&
  98        test $(
  99                git fast-export --import-marks=tmp-marks \
 100                --export-marks=tmp-marks HEAD |
 101                grep ^commit\  |
 102                wc -l) \
 103        -eq 1 &&
 104        test_line_count = 4 tmp-marks
 105
 106'
 107
 108cat > signed-tag-import << EOF
 109tag sign-your-name
 110from $(git rev-parse HEAD)
 111tagger C O Mitter <committer@example.com> 1112911993 -0700
 112data 210
 113A message for a sign
 114-----BEGIN PGP SIGNATURE-----
 115Version: GnuPG v1.4.5 (GNU/Linux)
 116
 117fakedsignaturefakedsignaturefakedsignaturefakedsignaturfakedsign
 118aturefakedsignaturefake=
 119=/59v
 120-----END PGP SIGNATURE-----
 121EOF
 122
 123test_expect_success 'set up faked signed tag' '
 124
 125        cat signed-tag-import | git fast-import
 126
 127'
 128
 129test_expect_success 'signed-tags=abort' '
 130
 131        test_must_fail git fast-export --signed-tags=abort sign-your-name
 132
 133'
 134
 135test_expect_success 'signed-tags=verbatim' '
 136
 137        git fast-export --signed-tags=verbatim sign-your-name > output &&
 138        grep PGP output
 139
 140'
 141
 142test_expect_success 'signed-tags=strip' '
 143
 144        git fast-export --signed-tags=strip sign-your-name > output &&
 145        ! grep PGP output
 146
 147'
 148
 149test_expect_success 'signed-tags=warn-strip' '
 150        git fast-export --signed-tags=warn-strip sign-your-name >output 2>err &&
 151        ! grep PGP output &&
 152        test -s err
 153'
 154
 155test_expect_success 'setup submodule' '
 156
 157        git checkout -f master &&
 158        mkdir sub &&
 159        (
 160                cd sub &&
 161                git init  &&
 162                echo test file > file &&
 163                git add file &&
 164                git commit -m sub_initial
 165        ) &&
 166        git submodule add "`pwd`/sub" sub &&
 167        git commit -m initial &&
 168        test_tick &&
 169        (
 170                cd sub &&
 171                echo more data >> file &&
 172                git add file &&
 173                git commit -m sub_second
 174        ) &&
 175        git add sub &&
 176        git commit -m second
 177
 178'
 179
 180test_expect_success 'submodule fast-export | fast-import' '
 181
 182        SUBENT1=$(git ls-tree master^ sub) &&
 183        SUBENT2=$(git ls-tree master sub) &&
 184        rm -rf new &&
 185        mkdir new &&
 186        git --git-dir=new/.git init &&
 187        git fast-export --signed-tags=strip --all |
 188        (cd new &&
 189         git fast-import &&
 190         test "$SUBENT1" = "$(git ls-tree refs/heads/master^ sub)" &&
 191         test "$SUBENT2" = "$(git ls-tree refs/heads/master sub)" &&
 192         git checkout master &&
 193         git submodule init &&
 194         git submodule update &&
 195         cmp sub/file ../sub/file)
 196
 197'
 198
 199GIT_AUTHOR_NAME='A U Thor'; export GIT_AUTHOR_NAME
 200GIT_COMMITTER_NAME='C O Mitter'; export GIT_COMMITTER_NAME
 201
 202test_expect_success 'setup copies' '
 203
 204        git config --unset i18n.commitencoding &&
 205        git checkout -b copy rein &&
 206        git mv file file3 &&
 207        git commit -m move1 &&
 208        test_tick &&
 209        cp file2 file4 &&
 210        git add file4 &&
 211        git mv file2 file5 &&
 212        git commit -m copy1 &&
 213        test_tick &&
 214        cp file3 file6 &&
 215        git add file6 &&
 216        git commit -m copy2 &&
 217        test_tick &&
 218        echo more text >> file6 &&
 219        echo even more text >> file6 &&
 220        git add file6 &&
 221        git commit -m modify &&
 222        test_tick &&
 223        cp file6 file7 &&
 224        echo test >> file7 &&
 225        git add file7 &&
 226        git commit -m copy_modify
 227
 228'
 229
 230test_expect_success 'fast-export -C -C | fast-import' '
 231
 232        ENTRY=$(git rev-parse --verify copy) &&
 233        rm -rf new &&
 234        mkdir new &&
 235        git --git-dir=new/.git init &&
 236        git fast-export -C -C --signed-tags=strip --all > output &&
 237        grep "^C file6 file7\$" output &&
 238        cat output |
 239        (cd new &&
 240         git fast-import &&
 241         test $ENTRY = $(git rev-parse --verify refs/heads/copy))
 242
 243'
 244
 245test_expect_success 'fast-export | fast-import when master is tagged' '
 246
 247        git tag -m msg last &&
 248        git fast-export -C -C --signed-tags=strip --all > output &&
 249        test $(grep -c "^tag " output) = 3
 250
 251'
 252
 253cat > tag-content << EOF
 254object $(git rev-parse HEAD)
 255type commit
 256tag rosten
 257EOF
 258
 259test_expect_success 'cope with tagger-less tags' '
 260
 261        TAG=$(git hash-object -t tag -w tag-content) &&
 262        git update-ref refs/tags/sonnenschein $TAG &&
 263        git fast-export -C -C --signed-tags=strip --all > output &&
 264        test $(grep -c "^tag " output) = 4 &&
 265        ! grep "Unspecified Tagger" output &&
 266        git fast-export -C -C --signed-tags=strip --all \
 267                --fake-missing-tagger > output &&
 268        test $(grep -c "^tag " output) = 4 &&
 269        grep "Unspecified Tagger" output
 270
 271'
 272
 273test_expect_success 'setup for limiting exports by PATH' '
 274        mkdir limit-by-paths &&
 275        (
 276                cd limit-by-paths &&
 277                git init &&
 278                echo hi > there &&
 279                git add there &&
 280                git commit -m "First file" &&
 281                echo foo > bar &&
 282                git add bar &&
 283                git commit -m "Second file" &&
 284                git tag -a -m msg mytag &&
 285                echo morefoo >> bar &&
 286                git add bar &&
 287                git commit -m "Change to second file"
 288        )
 289'
 290
 291cat > limit-by-paths/expected << EOF
 292blob
 293mark :1
 294data 3
 295hi
 296
 297reset refs/tags/mytag
 298commit refs/tags/mytag
 299mark :2
 300author A U Thor <author@example.com> 1112912713 -0700
 301committer C O Mitter <committer@example.com> 1112912713 -0700
 302data 11
 303First file
 304M 100644 :1 there
 305
 306EOF
 307
 308test_expect_success 'dropping tag of filtered out object' '
 309(
 310        cd limit-by-paths &&
 311        git fast-export --tag-of-filtered-object=drop mytag -- there > output &&
 312        test_cmp expected output
 313)
 314'
 315
 316cat >> limit-by-paths/expected << EOF
 317tag mytag
 318from :2
 319tagger C O Mitter <committer@example.com> 1112912713 -0700
 320data 4
 321msg
 322
 323EOF
 324
 325test_expect_success 'rewriting tag of filtered out object' '
 326(
 327        cd limit-by-paths &&
 328        git fast-export --tag-of-filtered-object=rewrite mytag -- there > output &&
 329        test_cmp expected output
 330)
 331'
 332
 333cat > limit-by-paths/expected << EOF
 334blob
 335mark :1
 336data 4
 337foo
 338
 339blob
 340mark :2
 341data 3
 342hi
 343
 344reset refs/heads/master
 345commit refs/heads/master
 346mark :3
 347author A U Thor <author@example.com> 1112912713 -0700
 348committer C O Mitter <committer@example.com> 1112912713 -0700
 349data 12
 350Second file
 351M 100644 :1 bar
 352M 100644 :2 there
 353
 354EOF
 355
 356test_expect_failure 'no exact-ref revisions included' '
 357        (
 358                cd limit-by-paths &&
 359                git fast-export master~2..master~1 > output &&
 360                test_cmp expected output
 361        )
 362'
 363
 364test_expect_success 'path limiting with import-marks does not lose unmodified files'        '
 365        git checkout -b simple marks~2 &&
 366        git fast-export --export-marks=marks simple -- file > /dev/null &&
 367        echo more content >> file &&
 368        test_tick &&
 369        git commit -mnext file &&
 370        git fast-export --import-marks=marks simple -- file file0 | grep file0
 371'
 372
 373test_expect_success 'full-tree re-shows unmodified files'        '
 374        git checkout -f simple &&
 375        test $(git fast-export --full-tree simple | grep -c file0) -eq 3
 376'
 377
 378test_expect_success 'set-up a few more tags for tag export tests' '
 379        git checkout -f master &&
 380        HEAD_TREE=`git show -s --pretty=raw HEAD | grep tree | sed "s/tree //"` &&
 381        git tag    tree_tag        -m "tagging a tree" $HEAD_TREE &&
 382        git tag -a tree_tag-obj    -m "tagging a tree" $HEAD_TREE &&
 383        git tag    tag-obj_tag     -m "tagging a tag" tree_tag-obj &&
 384        git tag -a tag-obj_tag-obj -m "tagging a tag" tree_tag-obj
 385'
 386
 387test_expect_success 'tree_tag'        '
 388        mkdir result &&
 389        (cd result && git init) &&
 390        git fast-export tree_tag > fe-stream &&
 391        (cd result && git fast-import < ../fe-stream)
 392'
 393
 394# NEEDSWORK: not just check return status, but validate the output
 395test_expect_success 'tree_tag-obj'    'git fast-export tree_tag-obj'
 396test_expect_success 'tag-obj_tag'     'git fast-export tag-obj_tag'
 397test_expect_success 'tag-obj_tag-obj' 'git fast-export tag-obj_tag-obj'
 398
 399test_expect_success 'directory becomes symlink'        '
 400        git init dirtosymlink &&
 401        git init result &&
 402        (
 403                cd dirtosymlink &&
 404                mkdir foo &&
 405                mkdir bar &&
 406                echo hello > foo/world &&
 407                echo hello > bar/world &&
 408                git add foo/world bar/world &&
 409                git commit -q -mone &&
 410                git rm -r foo &&
 411                test_ln_s_add bar foo &&
 412                git commit -q -mtwo
 413        ) &&
 414        (
 415                cd dirtosymlink &&
 416                git fast-export master -- foo |
 417                (cd ../result && git fast-import --quiet)
 418        ) &&
 419        (cd result && git show master:foo)
 420'
 421
 422test_expect_success 'fast-export quotes pathnames' '
 423        git init crazy-paths &&
 424        (cd crazy-paths &&
 425         blob=`echo foo | git hash-object -w --stdin` &&
 426         git update-index --add \
 427                --cacheinfo 100644 $blob "$(printf "path with\\nnewline")" \
 428                --cacheinfo 100644 $blob "path with \"quote\"" \
 429                --cacheinfo 100644 $blob "path with \\backslash" \
 430                --cacheinfo 100644 $blob "path with space" &&
 431         git commit -m addition &&
 432         git ls-files -z -s | perl -0pe "s{\\t}{$&subdir/}" >index &&
 433         git read-tree --empty &&
 434         git update-index -z --index-info <index &&
 435         git commit -m rename &&
 436         git read-tree --empty &&
 437         git commit -m deletion &&
 438         git fast-export -M HEAD >export.out &&
 439         git rev-list HEAD >expect &&
 440         git init result &&
 441         cd result &&
 442         git fast-import <../export.out &&
 443         git rev-list HEAD >actual &&
 444         test_cmp ../expect actual
 445        )
 446'
 447
 448test_expect_success 'test bidirectionality' '
 449        >marks-cur &&
 450        >marks-new &&
 451        git init marks-test &&
 452        git fast-export --export-marks=marks-cur --import-marks=marks-cur --branches | \
 453        git --git-dir=marks-test/.git fast-import --export-marks=marks-new --import-marks=marks-new &&
 454        (cd marks-test &&
 455        git reset --hard &&
 456        echo Wohlauf > file &&
 457        git commit -a -m "back in time") &&
 458        git --git-dir=marks-test/.git fast-export --export-marks=marks-new --import-marks=marks-new --branches | \
 459        git fast-import --export-marks=marks-cur --import-marks=marks-cur
 460'
 461
 462cat > expected << EOF
 463blob
 464mark :13
 465data 5
 466bump
 467
 468commit refs/heads/master
 469mark :14
 470author A U Thor <author@example.com> 1112912773 -0700
 471committer C O Mitter <committer@example.com> 1112912773 -0700
 472data 5
 473bump
 474from :12
 475M 100644 :13 file
 476
 477EOF
 478
 479test_expect_success 'avoid uninteresting refs' '
 480        > tmp-marks &&
 481        git fast-export --import-marks=tmp-marks \
 482                --export-marks=tmp-marks master > /dev/null &&
 483        git tag v1.0 &&
 484        git branch uninteresting &&
 485        echo bump > file &&
 486        git commit -a -m bump &&
 487        git fast-export --import-marks=tmp-marks \
 488                --export-marks=tmp-marks ^uninteresting ^v1.0 master > actual &&
 489        test_cmp expected actual
 490'
 491
 492cat > expected << EOF
 493reset refs/heads/master
 494from :14
 495
 496EOF
 497
 498test_expect_success 'refs are updated even if no commits need to be exported' '
 499        > tmp-marks &&
 500        git fast-export --import-marks=tmp-marks \
 501                --export-marks=tmp-marks master > /dev/null &&
 502        git fast-export --import-marks=tmp-marks \
 503                --export-marks=tmp-marks master > actual &&
 504        test_cmp expected actual
 505'
 506
 507test_expect_success 'use refspec' '
 508        git fast-export --refspec refs/heads/master:refs/heads/foobar master | \
 509                grep "^commit " | sort | uniq > actual &&
 510        echo "commit refs/heads/foobar" > expected &&
 511        test_cmp expected actual
 512'
 513
 514test_expect_success 'delete refspec' '
 515        git branch to-delete &&
 516        git fast-export --refspec :refs/heads/to-delete to-delete ^to-delete > actual &&
 517        cat > expected <<-EOF &&
 518        reset refs/heads/to-delete
 519        from 0000000000000000000000000000000000000000
 520
 521        EOF
 522        test_cmp expected actual
 523'
 524
 525test_done