t / t9350-fast-export.shon commit git-am: Add tests for `--keep-cr`, `--no-keep-cr` and `am.keepcr` (6d8d8e0)
   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 $(wc -l < tmp-marks) -eq 3 &&
  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 $(wc -l < tmp-marks) -eq 4
 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 'setup submodule' '
 150
 151        git checkout -f master &&
 152        mkdir sub &&
 153        cd sub &&
 154        git init  &&
 155        echo test file > file &&
 156        git add file &&
 157        git commit -m sub_initial &&
 158        cd .. &&
 159        git submodule add "`pwd`/sub" sub &&
 160        git commit -m initial &&
 161        test_tick &&
 162        cd sub &&
 163        echo more data >> file &&
 164        git add file &&
 165        git commit -m sub_second &&
 166        cd .. &&
 167        git add sub &&
 168        git commit -m second
 169
 170'
 171
 172test_expect_success 'submodule fast-export | fast-import' '
 173
 174        SUBENT1=$(git ls-tree master^ sub) &&
 175        SUBENT2=$(git ls-tree master sub) &&
 176        rm -rf new &&
 177        mkdir new &&
 178        git --git-dir=new/.git init &&
 179        git fast-export --signed-tags=strip --all |
 180        (cd new &&
 181         git fast-import &&
 182         test "$SUBENT1" = "$(git ls-tree refs/heads/master^ sub)" &&
 183         test "$SUBENT2" = "$(git ls-tree refs/heads/master sub)" &&
 184         git checkout master &&
 185         git submodule init &&
 186         git submodule update &&
 187         cmp sub/file ../sub/file)
 188
 189'
 190
 191GIT_AUTHOR_NAME='A U Thor'; export GIT_AUTHOR_NAME
 192GIT_COMMITTER_NAME='C O Mitter'; export GIT_COMMITTER_NAME
 193
 194test_expect_success 'setup copies' '
 195
 196        git config --unset i18n.commitencoding &&
 197        git checkout -b copy rein &&
 198        git mv file file3 &&
 199        git commit -m move1 &&
 200        test_tick &&
 201        cp file2 file4 &&
 202        git add file4 &&
 203        git mv file2 file5 &&
 204        git commit -m copy1 &&
 205        test_tick &&
 206        cp file3 file6 &&
 207        git add file6 &&
 208        git commit -m copy2 &&
 209        test_tick &&
 210        echo more text >> file6 &&
 211        echo even more text >> file6 &&
 212        git add file6 &&
 213        git commit -m modify &&
 214        test_tick &&
 215        cp file6 file7 &&
 216        echo test >> file7 &&
 217        git add file7 &&
 218        git commit -m copy_modify
 219
 220'
 221
 222test_expect_success 'fast-export -C -C | fast-import' '
 223
 224        ENTRY=$(git rev-parse --verify copy) &&
 225        rm -rf new &&
 226        mkdir new &&
 227        git --git-dir=new/.git init &&
 228        git fast-export -C -C --signed-tags=strip --all > output &&
 229        grep "^C \"file6\" \"file7\"\$" output &&
 230        cat output |
 231        (cd new &&
 232         git fast-import &&
 233         test $ENTRY = $(git rev-parse --verify refs/heads/copy))
 234
 235'
 236
 237test_expect_success 'fast-export | fast-import when master is tagged' '
 238
 239        git tag -m msg last &&
 240        git fast-export -C -C --signed-tags=strip --all > output &&
 241        test $(grep -c "^tag " output) = 3
 242
 243'
 244
 245cat > tag-content << EOF
 246object $(git rev-parse HEAD)
 247type commit
 248tag rosten
 249EOF
 250
 251test_expect_success 'cope with tagger-less tags' '
 252
 253        TAG=$(git hash-object -t tag -w tag-content) &&
 254        git update-ref refs/tags/sonnenschein $TAG &&
 255        git fast-export -C -C --signed-tags=strip --all > output &&
 256        test $(grep -c "^tag " output) = 4 &&
 257        ! grep "Unspecified Tagger" output &&
 258        git fast-export -C -C --signed-tags=strip --all \
 259                --fake-missing-tagger > output &&
 260        test $(grep -c "^tag " output) = 4 &&
 261        grep "Unspecified Tagger" output
 262
 263'
 264
 265test_expect_success 'setup for limiting exports by PATH' '
 266        mkdir limit-by-paths &&
 267        cd limit-by-paths &&
 268        git init &&
 269        echo hi > there &&
 270        git add there &&
 271        git commit -m "First file" &&
 272        echo foo > bar &&
 273        git add bar &&
 274        git commit -m "Second file" &&
 275        git tag -a -m msg mytag &&
 276        echo morefoo >> bar &&
 277        git add bar &&
 278        git commit -m "Change to second file" &&
 279        cd ..
 280'
 281
 282cat > limit-by-paths/expected << EOF
 283blob
 284mark :1
 285data 3
 286hi
 287
 288reset refs/tags/mytag
 289commit refs/tags/mytag
 290mark :2
 291author A U Thor <author@example.com> 1112912713 -0700
 292committer C O Mitter <committer@example.com> 1112912713 -0700
 293data 11
 294First file
 295M 100644 :1 there
 296
 297EOF
 298
 299test_expect_success 'dropping tag of filtered out object' '
 300        cd limit-by-paths &&
 301        git fast-export --tag-of-filtered-object=drop mytag -- there > output &&
 302        test_cmp output expected &&
 303        cd ..
 304'
 305
 306cat >> limit-by-paths/expected << EOF
 307tag mytag
 308from :2
 309tagger C O Mitter <committer@example.com> 1112912713 -0700
 310data 4
 311msg
 312
 313EOF
 314
 315test_expect_success 'rewriting tag of filtered out object' '
 316        cd limit-by-paths &&
 317        git fast-export --tag-of-filtered-object=rewrite mytag -- there > output &&
 318        test_cmp output expected &&
 319        cd ..
 320'
 321
 322cat > limit-by-paths/expected << EOF
 323blob
 324mark :1
 325data 4
 326foo
 327
 328blob
 329mark :2
 330data 3
 331hi
 332
 333reset refs/heads/master
 334commit refs/heads/master
 335mark :3
 336author A U Thor <author@example.com> 1112912713 -0700
 337committer C O Mitter <committer@example.com> 1112912713 -0700
 338data 12
 339Second file
 340M 100644 :1 bar
 341M 100644 :2 there
 342
 343EOF
 344
 345test_expect_failure 'no exact-ref revisions included' '
 346        cd limit-by-paths &&
 347        git fast-export master~2..master~1 > output &&
 348        test_cmp output expected &&
 349        cd ..
 350'
 351
 352
 353test_expect_success 'set-up a few more tags for tag export tests' '
 354        git checkout -f master &&
 355        HEAD_TREE=`git show -s --pretty=raw HEAD | grep tree | sed "s/tree //"` &&
 356        git tag    tree_tag        -m "tagging a tree" $HEAD_TREE &&
 357        git tag -a tree_tag-obj    -m "tagging a tree" $HEAD_TREE &&
 358        git tag    tag-obj_tag     -m "tagging a tag" tree_tag-obj &&
 359        git tag -a tag-obj_tag-obj -m "tagging a tag" tree_tag-obj
 360'
 361
 362test_expect_success 'tree_tag'        '
 363        mkdir result &&
 364        (cd result && git init) &&
 365        git fast-export tree_tag > fe-stream &&
 366        (cd result && git fast-import < ../fe-stream)
 367'
 368
 369# NEEDSWORK: not just check return status, but validate the output
 370test_expect_success 'tree_tag-obj'    'git fast-export tree_tag-obj'
 371test_expect_success 'tag-obj_tag'     'git fast-export tag-obj_tag'
 372test_expect_success 'tag-obj_tag-obj' 'git fast-export tag-obj_tag-obj'
 373
 374test_done