Andrew's git / gitweb.git / t/t9300-fast-import.sh
?
t / t9300-fast-import.shon commit test-lib: use subshell instead of cd $new && .. && cd $old (0d314ce)
   1#!/bin/sh
   2#
   3# Copyright (c) 2007 Shawn Pearce
   4#
   5
   6test_description='test git fast-import utility'
   7. ./test-lib.sh
   8. "$TEST_DIRECTORY"/diff-lib.sh ;# test-lib chdir's into trash
   9
  10file2_data='file2
  11second line of EOF'
  12
  13file3_data='EOF
  14in 3rd file
  15 END'
  16
  17file4_data=abcd
  18file4_len=4
  19
  20file5_data='an inline file.
  21  we should see it later.'
  22
  23file6_data='#!/bin/sh
  24echo "$@"'
  25
  26###
  27### series A
  28###
  29
  30test_tick
  31cat >input <<INPUT_END
  32blob
  33mark :2
  34data <<EOF
  35$file2_data
  36EOF
  37
  38blob
  39mark :3
  40data <<END
  41$file3_data
  42END
  43
  44blob
  45mark :4
  46data $file4_len
  47$file4_data
  48commit refs/heads/master
  49mark :5
  50committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
  51data <<COMMIT
  52initial
  53COMMIT
  54
  55M 644 :2 file2
  56M 644 :3 file3
  57M 755 :4 file4
  58
  59tag series-A
  60from :5
  61data <<EOF
  62An annotated tag without a tagger
  63EOF
  64
  65INPUT_END
  66test_expect_success \
  67    'A: create pack from stdin' \
  68    'git fast-import --export-marks=marks.out <input &&
  69         git whatchanged master'
  70test_expect_success \
  71        'A: verify pack' \
  72        'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'
  73
  74cat >expect <<EOF
  75author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
  76committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
  77
  78initial
  79EOF
  80test_expect_success \
  81        'A: verify commit' \
  82        'git cat-file commit master | sed 1d >actual &&
  83        test_cmp expect actual'
  84
  85cat >expect <<EOF
  86100644 blob file2
  87100644 blob file3
  88100755 blob file4
  89EOF
  90test_expect_success \
  91        'A: verify tree' \
  92        'git cat-file -p master^{tree} | sed "s/ [0-9a-f]*      / /" >actual &&
  93         test_cmp expect actual'
  94
  95echo "$file2_data" >expect
  96test_expect_success \
  97        'A: verify file2' \
  98        'git cat-file blob master:file2 >actual && test_cmp expect actual'
  99
 100echo "$file3_data" >expect
 101test_expect_success \
 102        'A: verify file3' \
 103        'git cat-file blob master:file3 >actual && test_cmp expect actual'
 104
 105printf "$file4_data" >expect
 106test_expect_success \
 107        'A: verify file4' \
 108        'git cat-file blob master:file4 >actual && test_cmp expect actual'
 109
 110cat >expect <<EOF
 111object $(git rev-parse refs/heads/master)
 112type commit
 113tag series-A
 114
 115An annotated tag without a tagger
 116EOF
 117test_expect_success 'A: verify tag/series-A' '
 118        git cat-file tag tags/series-A >actual &&
 119        test_cmp expect actual
 120'
 121
 122cat >expect <<EOF
 123:2 `git rev-parse --verify master:file2`
 124:3 `git rev-parse --verify master:file3`
 125:4 `git rev-parse --verify master:file4`
 126:5 `git rev-parse --verify master^0`
 127EOF
 128test_expect_success \
 129        'A: verify marks output' \
 130        'test_cmp expect marks.out'
 131
 132test_expect_success \
 133        'A: verify marks import' \
 134        'git fast-import \
 135                --import-marks=marks.out \
 136                --export-marks=marks.new \
 137                </dev/null &&
 138        test_cmp expect marks.new'
 139
 140test_tick
 141cat >input <<INPUT_END
 142commit refs/heads/verify--import-marks
 143committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 144data <<COMMIT
 145recreate from :5
 146COMMIT
 147
 148from :5
 149M 755 :2 copy-of-file2
 150
 151INPUT_END
 152test_expect_success \
 153        'A: verify marks import does not crash' \
 154        'git fast-import --import-marks=marks.out <input &&
 155         git whatchanged verify--import-marks'
 156test_expect_success \
 157        'A: verify pack' \
 158        'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'
 159cat >expect <<EOF
 160:000000 100755 0000000000000000000000000000000000000000 7123f7f44e39be127c5eb701e5968176ee9d78b1 A      copy-of-file2
 161EOF
 162git diff-tree -M -r master verify--import-marks >actual
 163test_expect_success \
 164        'A: verify diff' \
 165        'compare_diff_raw expect actual &&
 166         test `git rev-parse --verify master:file2` \
 167            = `git rev-parse --verify verify--import-marks:copy-of-file2`'
 168
 169test_tick
 170mt=$(git hash-object --stdin < /dev/null)
 171: >input.blob
 172: >marks.exp
 173: >tree.exp
 174
 175cat >input.commit <<EOF
 176commit refs/heads/verify--dump-marks
 177committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 178data <<COMMIT
 179test the sparse array dumping routines with exponentially growing marks
 180COMMIT
 181EOF
 182
 183i=0
 184l=4
 185m=6
 186n=7
 187while test "$i" -lt 27; do
 188    cat >>input.blob <<EOF
 189blob
 190mark :$l
 191data 0
 192blob
 193mark :$m
 194data 0
 195blob
 196mark :$n
 197data 0
 198EOF
 199    echo "M 100644 :$l l$i" >>input.commit
 200    echo "M 100644 :$m m$i" >>input.commit
 201    echo "M 100644 :$n n$i" >>input.commit
 202
 203    echo ":$l $mt" >>marks.exp
 204    echo ":$m $mt" >>marks.exp
 205    echo ":$n $mt" >>marks.exp
 206
 207    printf "100644 blob $mt\tl$i\n" >>tree.exp
 208    printf "100644 blob $mt\tm$i\n" >>tree.exp
 209    printf "100644 blob $mt\tn$i\n" >>tree.exp
 210
 211    l=$(($l + $l))
 212    m=$(($m + $m))
 213    n=$(($l + $n))
 214
 215    i=$((1 + $i))
 216done
 217
 218sort tree.exp > tree.exp_s
 219
 220test_expect_success 'A: export marks with large values' '
 221        cat input.blob input.commit | git fast-import --export-marks=marks.large &&
 222        git ls-tree refs/heads/verify--dump-marks >tree.out &&
 223        test_cmp tree.exp_s tree.out &&
 224        test_cmp marks.exp marks.large'
 225
 226###
 227### series B
 228###
 229
 230test_tick
 231cat >input <<INPUT_END
 232commit refs/heads/branch
 233mark :1
 234committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 235data <<COMMIT
 236corrupt
 237COMMIT
 238
 239from refs/heads/master
 240M 755 0000000000000000000000000000000000000001 zero1
 241
 242INPUT_END
 243test_expect_success 'B: fail on invalid blob sha1' '
 244    test_must_fail git fast-import <input
 245'
 246rm -f .git/objects/pack_* .git/objects/index_*
 247
 248cat >input <<INPUT_END
 249commit .badbranchname
 250committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 251data <<COMMIT
 252corrupt
 253COMMIT
 254
 255from refs/heads/master
 256
 257INPUT_END
 258test_expect_success 'B: fail on invalid branch name ".badbranchname"' '
 259    test_must_fail git fast-import <input
 260'
 261rm -f .git/objects/pack_* .git/objects/index_*
 262
 263cat >input <<INPUT_END
 264commit bad[branch]name
 265committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 266data <<COMMIT
 267corrupt
 268COMMIT
 269
 270from refs/heads/master
 271
 272INPUT_END
 273test_expect_success 'B: fail on invalid branch name "bad[branch]name"' '
 274    test_must_fail git fast-import <input
 275'
 276rm -f .git/objects/pack_* .git/objects/index_*
 277
 278cat >input <<INPUT_END
 279commit TEMP_TAG
 280committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 281data <<COMMIT
 282tag base
 283COMMIT
 284
 285from refs/heads/master
 286
 287INPUT_END
 288test_expect_success \
 289    'B: accept branch name "TEMP_TAG"' \
 290    'git fast-import <input &&
 291         test -f .git/TEMP_TAG &&
 292         test `git rev-parse master` = `git rev-parse TEMP_TAG^`'
 293rm -f .git/TEMP_TAG
 294
 295###
 296### series C
 297###
 298
 299newf=`echo hi newf | git hash-object -w --stdin`
 300oldf=`git rev-parse --verify master:file2`
 301test_tick
 302cat >input <<INPUT_END
 303commit refs/heads/branch
 304committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 305data <<COMMIT
 306second
 307COMMIT
 308
 309from refs/heads/master
 310M 644 $oldf file2/oldf
 311M 755 $newf file2/newf
 312D file3
 313
 314INPUT_END
 315test_expect_success \
 316    'C: incremental import create pack from stdin' \
 317    'git fast-import <input &&
 318         git whatchanged branch'
 319test_expect_success \
 320        'C: verify pack' \
 321        'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'
 322test_expect_success \
 323        'C: validate reuse existing blob' \
 324        'test $newf = `git rev-parse --verify branch:file2/newf`
 325         test $oldf = `git rev-parse --verify branch:file2/oldf`'
 326
 327cat >expect <<EOF
 328parent `git rev-parse --verify master^0`
 329author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 330committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 331
 332second
 333EOF
 334test_expect_success \
 335        'C: verify commit' \
 336        'git cat-file commit branch | sed 1d >actual &&
 337         test_cmp expect actual'
 338
 339cat >expect <<EOF
 340:000000 100755 0000000000000000000000000000000000000000 f1fb5da718392694d0076d677d6d0e364c79b0bc A      file2/newf
 341:100644 100644 7123f7f44e39be127c5eb701e5968176ee9d78b1 7123f7f44e39be127c5eb701e5968176ee9d78b1 R100   file2   file2/oldf
 342:100644 000000 0d92e9f3374ae2947c23aa477cbc68ce598135f1 0000000000000000000000000000000000000000 D      file3
 343EOF
 344git diff-tree -M -r master branch >actual
 345test_expect_success \
 346        'C: validate rename result' \
 347        'compare_diff_raw expect actual'
 348
 349###
 350### series D
 351###
 352
 353test_tick
 354cat >input <<INPUT_END
 355commit refs/heads/branch
 356committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 357data <<COMMIT
 358third
 359COMMIT
 360
 361from refs/heads/branch^0
 362M 644 inline newdir/interesting
 363data <<EOF
 364$file5_data
 365EOF
 366
 367M 755 inline newdir/exec.sh
 368data <<EOF
 369$file6_data
 370EOF
 371
 372INPUT_END
 373test_expect_success \
 374    'D: inline data in commit' \
 375    'git fast-import <input &&
 376         git whatchanged branch'
 377test_expect_success \
 378        'D: verify pack' \
 379        'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'
 380
 381cat >expect <<EOF
 382:000000 100755 0000000000000000000000000000000000000000 35a59026a33beac1569b1c7f66f3090ce9c09afc A      newdir/exec.sh
 383:000000 100644 0000000000000000000000000000000000000000 046d0371e9220107917db0d0e030628de8a1de9b A      newdir/interesting
 384EOF
 385git diff-tree -M -r branch^ branch >actual
 386test_expect_success \
 387        'D: validate new files added' \
 388        'compare_diff_raw expect actual'
 389
 390echo "$file5_data" >expect
 391test_expect_success \
 392        'D: verify file5' \
 393        'git cat-file blob branch:newdir/interesting >actual &&
 394         test_cmp expect actual'
 395
 396echo "$file6_data" >expect
 397test_expect_success \
 398        'D: verify file6' \
 399        'git cat-file blob branch:newdir/exec.sh >actual &&
 400         test_cmp expect actual'
 401
 402###
 403### series E
 404###
 405
 406cat >input <<INPUT_END
 407commit refs/heads/branch
 408author $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> Tue Feb 6 11:22:18 2007 -0500
 409committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> Tue Feb 6 12:35:02 2007 -0500
 410data <<COMMIT
 411RFC 2822 type date
 412COMMIT
 413
 414from refs/heads/branch^0
 415
 416INPUT_END
 417test_expect_success 'E: rfc2822 date, --date-format=raw' '
 418    test_must_fail git fast-import --date-format=raw <input
 419'
 420test_expect_success \
 421    'E: rfc2822 date, --date-format=rfc2822' \
 422    'git fast-import --date-format=rfc2822 <input'
 423test_expect_success \
 424        'E: verify pack' \
 425        'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'
 426
 427cat >expect <<EOF
 428author $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> 1170778938 -0500
 429committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1170783302 -0500
 430
 431RFC 2822 type date
 432EOF
 433test_expect_success \
 434        'E: verify commit' \
 435        'git cat-file commit branch | sed 1,2d >actual &&
 436        test_cmp expect actual'
 437
 438###
 439### series F
 440###
 441
 442old_branch=`git rev-parse --verify branch^0`
 443test_tick
 444cat >input <<INPUT_END
 445commit refs/heads/branch
 446committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 447data <<COMMIT
 448losing things already?
 449COMMIT
 450
 451from refs/heads/branch~1
 452
 453reset refs/heads/other
 454from refs/heads/branch
 455
 456INPUT_END
 457test_expect_success \
 458    'F: non-fast-forward update skips' \
 459    'if git fast-import <input
 460         then
 461                echo BAD gfi did not fail
 462                return 1
 463         else
 464                if test $old_branch = `git rev-parse --verify branch^0`
 465                then
 466                        : branch unaffected and failure returned
 467                        return 0
 468                else
 469                        echo BAD gfi changed branch $old_branch
 470                        return 1
 471                fi
 472         fi
 473        '
 474test_expect_success \
 475        'F: verify pack' \
 476        'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'
 477
 478cat >expect <<EOF
 479tree `git rev-parse branch~1^{tree}`
 480parent `git rev-parse branch~1`
 481author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 482committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 483
 484losing things already?
 485EOF
 486test_expect_success \
 487        'F: verify other commit' \
 488        'git cat-file commit other >actual &&
 489        test_cmp expect actual'
 490
 491###
 492### series G
 493###
 494
 495old_branch=`git rev-parse --verify branch^0`
 496test_tick
 497cat >input <<INPUT_END
 498commit refs/heads/branch
 499committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 500data <<COMMIT
 501losing things already?
 502COMMIT
 503
 504from refs/heads/branch~1
 505
 506INPUT_END
 507test_expect_success \
 508    'G: non-fast-forward update forced' \
 509    'git fast-import --force <input'
 510test_expect_success \
 511        'G: verify pack' \
 512        'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'
 513test_expect_success \
 514        'G: branch changed, but logged' \
 515        'test $old_branch != `git rev-parse --verify branch^0` &&
 516         test $old_branch = `git rev-parse --verify branch@{1}`'
 517
 518###
 519### series H
 520###
 521
 522test_tick
 523cat >input <<INPUT_END
 524commit refs/heads/H
 525committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 526data <<COMMIT
 527third
 528COMMIT
 529
 530from refs/heads/branch^0
 531M 644 inline i-will-die
 532data <<EOF
 533this file will never exist.
 534EOF
 535
 536deleteall
 537M 644 inline h/e/l/lo
 538data <<EOF
 539$file5_data
 540EOF
 541
 542INPUT_END
 543test_expect_success \
 544    'H: deletall, add 1' \
 545    'git fast-import <input &&
 546         git whatchanged H'
 547test_expect_success \
 548        'H: verify pack' \
 549        'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'
 550
 551cat >expect <<EOF
 552:100755 000000 f1fb5da718392694d0076d677d6d0e364c79b0bc 0000000000000000000000000000000000000000 D      file2/newf
 553:100644 000000 7123f7f44e39be127c5eb701e5968176ee9d78b1 0000000000000000000000000000000000000000 D      file2/oldf
 554:100755 000000 85df50785d62d3b05ab03d9cbf7e4a0b49449730 0000000000000000000000000000000000000000 D      file4
 555:100644 100644 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 R100   newdir/interesting      h/e/l/lo
 556:100755 000000 e74b7d465e52746be2b4bae983670711e6e66657 0000000000000000000000000000000000000000 D      newdir/exec.sh
 557EOF
 558git diff-tree -M -r H^ H >actual
 559test_expect_success \
 560        'H: validate old files removed, new files added' \
 561        'compare_diff_raw expect actual'
 562
 563echo "$file5_data" >expect
 564test_expect_success \
 565        'H: verify file' \
 566        'git cat-file blob H:h/e/l/lo >actual &&
 567         test_cmp expect actual'
 568
 569###
 570### series I
 571###
 572
 573cat >input <<INPUT_END
 574commit refs/heads/export-boundary
 575committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 576data <<COMMIT
 577we have a border.  its only 40 characters wide.
 578COMMIT
 579
 580from refs/heads/branch
 581
 582INPUT_END
 583test_expect_success \
 584    'I: export-pack-edges' \
 585    'git fast-import --export-pack-edges=edges.list <input'
 586
 587cat >expect <<EOF
 588.git/objects/pack/pack-.pack: `git rev-parse --verify export-boundary`
 589EOF
 590test_expect_success \
 591        'I: verify edge list' \
 592        'sed -e s/pack-.*pack/pack-.pack/ edges.list >actual &&
 593         test_cmp expect actual'
 594
 595###
 596### series J
 597###
 598
 599cat >input <<INPUT_END
 600commit refs/heads/J
 601committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 602data <<COMMIT
 603create J
 604COMMIT
 605
 606from refs/heads/branch
 607
 608reset refs/heads/J
 609
 610commit refs/heads/J
 611committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 612data <<COMMIT
 613initialize J
 614COMMIT
 615
 616INPUT_END
 617test_expect_success \
 618    'J: reset existing branch creates empty commit' \
 619    'git fast-import <input'
 620test_expect_success \
 621        'J: branch has 1 commit, empty tree' \
 622        'test 1 = `git rev-list J | wc -l` &&
 623         test 0 = `git ls-tree J | wc -l`'
 624
 625###
 626### series K
 627###
 628
 629cat >input <<INPUT_END
 630commit refs/heads/K
 631committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 632data <<COMMIT
 633create K
 634COMMIT
 635
 636from refs/heads/branch
 637
 638commit refs/heads/K
 639committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 640data <<COMMIT
 641redo K
 642COMMIT
 643
 644from refs/heads/branch^1
 645
 646INPUT_END
 647test_expect_success \
 648    'K: reinit branch with from' \
 649    'git fast-import <input'
 650test_expect_success \
 651    'K: verify K^1 = branch^1' \
 652    'test `git rev-parse --verify branch^1` \
 653                = `git rev-parse --verify K^1`'
 654
 655###
 656### series L
 657###
 658
 659cat >input <<INPUT_END
 660blob
 661mark :1
 662data <<EOF
 663some data
 664EOF
 665
 666blob
 667mark :2
 668data <<EOF
 669other data
 670EOF
 671
 672commit refs/heads/L
 673committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 674data <<COMMIT
 675create L
 676COMMIT
 677
 678M 644 :1 b.
 679M 644 :1 b/other
 680M 644 :1 ba
 681
 682commit refs/heads/L
 683committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 684data <<COMMIT
 685update L
 686COMMIT
 687
 688M 644 :2 b.
 689M 644 :2 b/other
 690M 644 :2 ba
 691INPUT_END
 692
 693cat >expect <<EXPECT_END
 694:100644 100644 4268632... 55d3a52... M  b.
 695:040000 040000 0ae5cac... 443c768... M  b
 696:100644 100644 4268632... 55d3a52... M  ba
 697EXPECT_END
 698
 699test_expect_success \
 700    'L: verify internal tree sorting' \
 701        'git fast-import <input &&
 702         git diff-tree --abbrev --raw L^ L >output &&
 703         test_cmp expect output'
 704
 705###
 706### series M
 707###
 708
 709test_tick
 710cat >input <<INPUT_END
 711commit refs/heads/M1
 712committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 713data <<COMMIT
 714file rename
 715COMMIT
 716
 717from refs/heads/branch^0
 718R file2/newf file2/n.e.w.f
 719
 720INPUT_END
 721
 722cat >expect <<EOF
 723:100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc R100   file2/newf      file2/n.e.w.f
 724EOF
 725test_expect_success \
 726        'M: rename file in same subdirectory' \
 727        'git fast-import <input &&
 728         git diff-tree -M -r M1^ M1 >actual &&
 729         compare_diff_raw expect actual'
 730
 731cat >input <<INPUT_END
 732commit refs/heads/M2
 733committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 734data <<COMMIT
 735file rename
 736COMMIT
 737
 738from refs/heads/branch^0
 739R file2/newf i/am/new/to/you
 740
 741INPUT_END
 742
 743cat >expect <<EOF
 744:100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc R100   file2/newf      i/am/new/to/you
 745EOF
 746test_expect_success \
 747        'M: rename file to new subdirectory' \
 748        'git fast-import <input &&
 749         git diff-tree -M -r M2^ M2 >actual &&
 750         compare_diff_raw expect actual'
 751
 752cat >input <<INPUT_END
 753commit refs/heads/M3
 754committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 755data <<COMMIT
 756file rename
 757COMMIT
 758
 759from refs/heads/M2^0
 760R i other/sub
 761
 762INPUT_END
 763
 764cat >expect <<EOF
 765:100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc R100   i/am/new/to/you other/sub/am/new/to/you
 766EOF
 767test_expect_success \
 768        'M: rename subdirectory to new subdirectory' \
 769        'git fast-import <input &&
 770         git diff-tree -M -r M3^ M3 >actual &&
 771         compare_diff_raw expect actual'
 772
 773###
 774### series N
 775###
 776
 777test_tick
 778cat >input <<INPUT_END
 779commit refs/heads/N1
 780committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 781data <<COMMIT
 782file copy
 783COMMIT
 784
 785from refs/heads/branch^0
 786C file2/newf file2/n.e.w.f
 787
 788INPUT_END
 789
 790cat >expect <<EOF
 791:100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc C100   file2/newf      file2/n.e.w.f
 792EOF
 793test_expect_success \
 794        'N: copy file in same subdirectory' \
 795        'git fast-import <input &&
 796         git diff-tree -C --find-copies-harder -r N1^ N1 >actual &&
 797         compare_diff_raw expect actual'
 798
 799cat >input <<INPUT_END
 800commit refs/heads/N2
 801committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 802data <<COMMIT
 803clean directory copy
 804COMMIT
 805
 806from refs/heads/branch^0
 807C file2 file3
 808
 809commit refs/heads/N2
 810committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 811data <<COMMIT
 812modify directory copy
 813COMMIT
 814
 815M 644 inline file3/file5
 816data <<EOF
 817$file5_data
 818EOF
 819
 820INPUT_END
 821
 822cat >expect <<EOF
 823:100644 100644 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 C100   newdir/interesting      file3/file5
 824:100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc C100   file2/newf      file3/newf
 825:100644 100644 7123f7f44e39be127c5eb701e5968176ee9d78b1 7123f7f44e39be127c5eb701e5968176ee9d78b1 C100   file2/oldf      file3/oldf
 826EOF
 827test_expect_success \
 828        'N: copy then modify subdirectory' \
 829        'git fast-import <input &&
 830         git diff-tree -C --find-copies-harder -r N2^^ N2 >actual &&
 831         compare_diff_raw expect actual'
 832
 833cat >input <<INPUT_END
 834commit refs/heads/N3
 835committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 836data <<COMMIT
 837dirty directory copy
 838COMMIT
 839
 840from refs/heads/branch^0
 841M 644 inline file2/file5
 842data <<EOF
 843$file5_data
 844EOF
 845
 846C file2 file3
 847D file2/file5
 848
 849INPUT_END
 850
 851test_expect_success \
 852        'N: copy dirty subdirectory' \
 853        'git fast-import <input &&
 854         test `git rev-parse N2^{tree}` = `git rev-parse N3^{tree}`'
 855
 856###
 857### series O
 858###
 859
 860cat >input <<INPUT_END
 861#we will
 862commit refs/heads/O1
 863# -- ignore all of this text
 864committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 865# $GIT_COMMITTER_NAME has inserted here for his benefit.
 866data <<COMMIT
 867dirty directory copy
 868COMMIT
 869
 870# don't forget the import blank line!
 871#
 872# yes, we started from our usual base of branch^0.
 873# i like branch^0.
 874from refs/heads/branch^0
 875# and we need to reuse file2/file5 from N3 above.
 876M 644 inline file2/file5
 877# otherwise the tree will be different
 878data <<EOF
 879$file5_data
 880EOF
 881
 882# don't forget to copy file2 to file3
 883C file2 file3
 884#
 885# or to delete file5 from file2.
 886D file2/file5
 887# are we done yet?
 888
 889INPUT_END
 890
 891test_expect_success \
 892        'O: comments are all skipped' \
 893        'git fast-import <input &&
 894         test `git rev-parse N3` = `git rev-parse O1`'
 895
 896cat >input <<INPUT_END
 897commit refs/heads/O2
 898committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 899data <<COMMIT
 900dirty directory copy
 901COMMIT
 902from refs/heads/branch^0
 903M 644 inline file2/file5
 904data <<EOF
 905$file5_data
 906EOF
 907C file2 file3
 908D file2/file5
 909
 910INPUT_END
 911
 912test_expect_success \
 913        'O: blank lines not necessary after data commands' \
 914        'git fast-import <input &&
 915         test `git rev-parse N3` = `git rev-parse O2`'
 916
 917test_expect_success \
 918        'O: repack before next test' \
 919        'git repack -a -d'
 920
 921cat >input <<INPUT_END
 922commit refs/heads/O3
 923committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 924data <<COMMIT
 925zstring
 926COMMIT
 927commit refs/heads/O3
 928committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 929data <<COMMIT
 930zof
 931COMMIT
 932checkpoint
 933commit refs/heads/O3
 934mark :5
 935committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 936data <<COMMIT
 937zempty
 938COMMIT
 939checkpoint
 940commit refs/heads/O3
 941committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 942data <<COMMIT
 943zcommits
 944COMMIT
 945reset refs/tags/O3-2nd
 946from :5
 947reset refs/tags/O3-3rd
 948from :5
 949INPUT_END
 950
 951cat >expect <<INPUT_END
 952string
 953of
 954empty
 955commits
 956INPUT_END
 957test_expect_success \
 958        'O: blank lines not necessary after other commands' \
 959        'git fast-import <input &&
 960         test 8 = `find .git/objects/pack -type f | wc -l` &&
 961         test `git rev-parse refs/tags/O3-2nd` = `git rev-parse O3^` &&
 962         git log --reverse --pretty=oneline O3 | sed s/^.*z// >actual &&
 963         test_cmp expect actual'
 964
 965cat >input <<INPUT_END
 966commit refs/heads/O4
 967committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 968data <<COMMIT
 969zstring
 970COMMIT
 971commit refs/heads/O4
 972committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 973data <<COMMIT
 974zof
 975COMMIT
 976progress Two commits down, 2 to go!
 977commit refs/heads/O4
 978committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 979data <<COMMIT
 980zempty
 981COMMIT
 982progress Three commits down, 1 to go!
 983commit refs/heads/O4
 984committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 985data <<COMMIT
 986zcommits
 987COMMIT
 988progress I'm done!
 989INPUT_END
 990test_expect_success \
 991        'O: progress outputs as requested by input' \
 992        'git fast-import <input >actual &&
 993         grep "progress " <input >expect &&
 994         test_cmp expect actual'
 995
 996###
 997### series P (gitlinks)
 998###
 999
1000cat >input <<INPUT_END
1001blob
1002mark :1
1003data 10
1004test file
1005
1006reset refs/heads/sub
1007commit refs/heads/sub
1008mark :2
1009committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1010data 12
1011sub_initial
1012M 100644 :1 file
1013
1014blob
1015mark :3
1016data <<DATAEND
1017[submodule "sub"]
1018        path = sub
1019        url = "`pwd`/sub"
1020DATAEND
1021
1022commit refs/heads/subuse1
1023mark :4
1024committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1025data 8
1026initial
1027from refs/heads/master
1028M 100644 :3 .gitmodules
1029M 160000 :2 sub
1030
1031blob
1032mark :5
1033data 20
1034test file
1035more data
1036
1037commit refs/heads/sub
1038mark :6
1039committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1040data 11
1041sub_second
1042from :2
1043M 100644 :5 file
1044
1045commit refs/heads/subuse1
1046mark :7
1047committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1048data 7
1049second
1050from :4
1051M 160000 :6 sub
1052
1053INPUT_END
1054
1055test_expect_success \
1056        'P: supermodule & submodule mix' \
1057        'git fast-import <input &&
1058         git checkout subuse1 &&
1059         rm -rf sub && mkdir sub && cd sub &&
1060         git init &&
1061         git fetch --update-head-ok .. refs/heads/sub:refs/heads/master &&
1062         git checkout master &&
1063         cd .. &&
1064         git submodule init &&
1065         git submodule update'
1066
1067SUBLAST=$(git rev-parse --verify sub)
1068SUBPREV=$(git rev-parse --verify sub^)
1069
1070cat >input <<INPUT_END
1071blob
1072mark :1
1073data <<DATAEND
1074[submodule "sub"]
1075        path = sub
1076        url = "`pwd`/sub"
1077DATAEND
1078
1079commit refs/heads/subuse2
1080mark :2
1081committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1082data 8
1083initial
1084from refs/heads/master
1085M 100644 :1 .gitmodules
1086M 160000 $SUBPREV sub
1087
1088commit refs/heads/subuse2
1089mark :3
1090committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1091data 7
1092second
1093from :2
1094M 160000 $SUBLAST sub
1095
1096INPUT_END
1097
1098test_expect_success \
1099        'P: verbatim SHA gitlinks' \
1100        'git branch -D sub &&
1101         git gc && git prune &&
1102         git fast-import <input &&
1103         test $(git rev-parse --verify subuse2) = $(git rev-parse --verify subuse1)'
1104
1105test_tick
1106cat >input <<INPUT_END
1107commit refs/heads/subuse3
1108mark :1
1109committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1110data <<COMMIT
1111corrupt
1112COMMIT
1113
1114from refs/heads/subuse2
1115M 160000 inline sub
1116data <<DATA
1117$SUBPREV
1118DATA
1119
1120INPUT_END
1121
1122test_expect_success 'P: fail on inline gitlink' '
1123    test_must_fail git fast-import <input'
1124
1125test_tick
1126cat >input <<INPUT_END
1127blob
1128mark :1
1129data <<DATA
1130$SUBPREV
1131DATA
1132
1133commit refs/heads/subuse3
1134mark :2
1135committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1136data <<COMMIT
1137corrupt
1138COMMIT
1139
1140from refs/heads/subuse2
1141M 160000 :1 sub
1142
1143INPUT_END
1144
1145test_expect_success 'P: fail on blob mark in gitlink' '
1146    test_must_fail git fast-import <input'
1147
1148###
1149### series Q (notes)
1150###
1151
1152note1_data="The first note for the first commit"
1153note2_data="The first note for the second commit"
1154note3_data="The first note for the third commit"
1155note1b_data="The second note for the first commit"
1156note1c_data="The third note for the first commit"
1157note2b_data="The second note for the second commit"
1158
1159test_tick
1160cat >input <<INPUT_END
1161blob
1162mark :2
1163data <<EOF
1164$file2_data
1165EOF
1166
1167commit refs/heads/notes-test
1168mark :3
1169committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1170data <<COMMIT
1171first (:3)
1172COMMIT
1173
1174M 644 :2 file2
1175
1176blob
1177mark :4
1178data $file4_len
1179$file4_data
1180commit refs/heads/notes-test
1181mark :5
1182committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1183data <<COMMIT
1184second (:5)
1185COMMIT
1186
1187M 644 :4 file4
1188
1189commit refs/heads/notes-test
1190mark :6
1191committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1192data <<COMMIT
1193third (:6)
1194COMMIT
1195
1196M 644 inline file5
1197data <<EOF
1198$file5_data
1199EOF
1200
1201M 755 inline file6
1202data <<EOF
1203$file6_data
1204EOF
1205
1206blob
1207mark :7
1208data <<EOF
1209$note1_data
1210EOF
1211
1212blob
1213mark :8
1214data <<EOF
1215$note2_data
1216EOF
1217
1218commit refs/notes/foobar
1219mark :9
1220committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1221data <<COMMIT
1222notes (:9)
1223COMMIT
1224
1225N :7 :3
1226N :8 :5
1227N inline :6
1228data <<EOF
1229$note3_data
1230EOF
1231
1232commit refs/notes/foobar
1233mark :10
1234committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1235data <<COMMIT
1236notes (:10)
1237COMMIT
1238
1239N inline :3
1240data <<EOF
1241$note1b_data
1242EOF
1243
1244commit refs/notes/foobar2
1245mark :11
1246committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1247data <<COMMIT
1248notes (:11)
1249COMMIT
1250
1251N inline :3
1252data <<EOF
1253$note1c_data
1254EOF
1255
1256commit refs/notes/foobar
1257mark :12
1258committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1259data <<COMMIT
1260notes (:12)
1261COMMIT
1262
1263deleteall
1264N inline :5
1265data <<EOF
1266$note2b_data
1267EOF
1268
1269INPUT_END
1270
1271test_expect_success \
1272        'Q: commit notes' \
1273        'git fast-import <input &&
1274         git whatchanged notes-test'
1275test_expect_success \
1276        'Q: verify pack' \
1277        'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'
1278
1279commit1=$(git rev-parse notes-test~2)
1280commit2=$(git rev-parse notes-test^)
1281commit3=$(git rev-parse notes-test)
1282
1283cat >expect <<EOF
1284author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1285committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1286
1287first (:3)
1288EOF
1289test_expect_success \
1290        'Q: verify first commit' \
1291        'git cat-file commit notes-test~2 | sed 1d >actual &&
1292        test_cmp expect actual'
1293
1294cat >expect <<EOF
1295parent $commit1
1296author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1297committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1298
1299second (:5)
1300EOF
1301test_expect_success \
1302        'Q: verify second commit' \
1303        'git cat-file commit notes-test^ | sed 1d >actual &&
1304        test_cmp expect actual'
1305
1306cat >expect <<EOF
1307parent $commit2
1308author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1309committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1310
1311third (:6)
1312EOF
1313test_expect_success \
1314        'Q: verify third commit' \
1315        'git cat-file commit notes-test | sed 1d >actual &&
1316        test_cmp expect actual'
1317
1318cat >expect <<EOF
1319author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1320committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1321
1322notes (:9)
1323EOF
1324test_expect_success \
1325        'Q: verify first notes commit' \
1326        'git cat-file commit refs/notes/foobar~2 | sed 1d >actual &&
1327        test_cmp expect actual'
1328
1329cat >expect.unsorted <<EOF
1330100644 blob $commit1
1331100644 blob $commit2
1332100644 blob $commit3
1333EOF
1334cat expect.unsorted | sort >expect
1335test_expect_success \
1336        'Q: verify first notes tree' \
1337        'git cat-file -p refs/notes/foobar~2^{tree} | sed "s/ [0-9a-f]* / /" >actual &&
1338         test_cmp expect actual'
1339
1340echo "$note1_data" >expect
1341test_expect_success \
1342        'Q: verify first note for first commit' \
1343        'git cat-file blob refs/notes/foobar~2:$commit1 >actual && test_cmp expect actual'
1344
1345echo "$note2_data" >expect
1346test_expect_success \
1347        'Q: verify first note for second commit' \
1348        'git cat-file blob refs/notes/foobar~2:$commit2 >actual && test_cmp expect actual'
1349
1350echo "$note3_data" >expect
1351test_expect_success \
1352        'Q: verify first note for third commit' \
1353        'git cat-file blob refs/notes/foobar~2:$commit3 >actual && test_cmp expect actual'
1354
1355cat >expect <<EOF
1356parent `git rev-parse --verify refs/notes/foobar~2`
1357author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1358committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1359
1360notes (:10)
1361EOF
1362test_expect_success \
1363        'Q: verify second notes commit' \
1364        'git cat-file commit refs/notes/foobar^ | sed 1d >actual &&
1365        test_cmp expect actual'
1366
1367cat >expect.unsorted <<EOF
1368100644 blob $commit1
1369100644 blob $commit2
1370100644 blob $commit3
1371EOF
1372cat expect.unsorted | sort >expect
1373test_expect_success \
1374        'Q: verify second notes tree' \
1375        'git cat-file -p refs/notes/foobar^^{tree} | sed "s/ [0-9a-f]*  / /" >actual &&
1376         test_cmp expect actual'
1377
1378echo "$note1b_data" >expect
1379test_expect_success \
1380        'Q: verify second note for first commit' \
1381        'git cat-file blob refs/notes/foobar^:$commit1 >actual && test_cmp expect actual'
1382
1383echo "$note2_data" >expect
1384test_expect_success \
1385        'Q: verify first note for second commit' \
1386        'git cat-file blob refs/notes/foobar^:$commit2 >actual && test_cmp expect actual'
1387
1388echo "$note3_data" >expect
1389test_expect_success \
1390        'Q: verify first note for third commit' \
1391        'git cat-file blob refs/notes/foobar^:$commit3 >actual && test_cmp expect actual'
1392
1393cat >expect <<EOF
1394author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1395committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1396
1397notes (:11)
1398EOF
1399test_expect_success \
1400        'Q: verify third notes commit' \
1401        'git cat-file commit refs/notes/foobar2 | sed 1d >actual &&
1402        test_cmp expect actual'
1403
1404cat >expect.unsorted <<EOF
1405100644 blob $commit1
1406EOF
1407cat expect.unsorted | sort >expect
1408test_expect_success \
1409        'Q: verify third notes tree' \
1410        'git cat-file -p refs/notes/foobar2^{tree} | sed "s/ [0-9a-f]*  / /" >actual &&
1411         test_cmp expect actual'
1412
1413echo "$note1c_data" >expect
1414test_expect_success \
1415        'Q: verify third note for first commit' \
1416        'git cat-file blob refs/notes/foobar2:$commit1 >actual && test_cmp expect actual'
1417
1418cat >expect <<EOF
1419parent `git rev-parse --verify refs/notes/foobar^`
1420author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1421committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1422
1423notes (:12)
1424EOF
1425test_expect_success \
1426        'Q: verify fourth notes commit' \
1427        'git cat-file commit refs/notes/foobar | sed 1d >actual &&
1428        test_cmp expect actual'
1429
1430cat >expect.unsorted <<EOF
1431100644 blob $commit2
1432EOF
1433cat expect.unsorted | sort >expect
1434test_expect_success \
1435        'Q: verify fourth notes tree' \
1436        'git cat-file -p refs/notes/foobar^{tree} | sed "s/ [0-9a-f]*   / /" >actual &&
1437         test_cmp expect actual'
1438
1439echo "$note2b_data" >expect
1440test_expect_success \
1441        'Q: verify second note for second commit' \
1442        'git cat-file blob refs/notes/foobar:$commit2 >actual && test_cmp expect actual'
1443
1444###
1445### series R (feature and option)
1446###
1447
1448cat >input <<EOF
1449feature no-such-feature-exists
1450EOF
1451
1452test_expect_success 'R: abort on unsupported feature' '
1453        test_must_fail git fast-import <input
1454'
1455
1456cat >input <<EOF
1457feature date-format=now
1458EOF
1459
1460test_expect_success 'R: supported feature is accepted' '
1461        git fast-import <input
1462'
1463
1464cat >input << EOF
1465blob
1466data 3
1467hi
1468feature date-format=now
1469EOF
1470
1471test_expect_success 'R: abort on receiving feature after data command' '
1472        test_must_fail git fast-import <input
1473'
1474
1475cat >input << EOF
1476feature import-marks=git.marks
1477feature import-marks=git2.marks
1478EOF
1479
1480test_expect_success 'R: only one import-marks feature allowed per stream' '
1481        test_must_fail git fast-import <input
1482'
1483
1484cat >input << EOF
1485feature export-marks=git.marks
1486blob
1487mark :1
1488data 3
1489hi
1490
1491EOF
1492
1493test_expect_success \
1494    'R: export-marks feature results in a marks file being created' \
1495    'cat input | git fast-import &&
1496    grep :1 git.marks'
1497
1498test_expect_success \
1499    'R: export-marks options can be overriden by commandline options' \
1500    'cat input | git fast-import --export-marks=other.marks &&
1501    grep :1 other.marks'
1502
1503cat >input << EOF
1504feature import-marks=marks.out
1505feature export-marks=marks.new
1506EOF
1507
1508test_expect_success \
1509    'R: import to output marks works without any content' \
1510    'cat input | git fast-import &&
1511    test_cmp marks.out marks.new'
1512
1513cat >input <<EOF
1514feature import-marks=nonexistant.marks
1515feature export-marks=marks.new
1516EOF
1517
1518test_expect_success \
1519    'R: import marks prefers commandline marks file over the stream' \
1520    'cat input | git fast-import --import-marks=marks.out &&
1521    test_cmp marks.out marks.new'
1522
1523
1524cat >input <<EOF
1525feature import-marks=nonexistant.marks
1526feature export-marks=combined.marks
1527EOF
1528
1529test_expect_success 'R: multiple --import-marks= should be honoured' '
1530    head -n2 marks.out > one.marks &&
1531    tail -n +3 marks.out > two.marks &&
1532    git fast-import --import-marks=one.marks --import-marks=two.marks <input &&
1533    test_cmp marks.out combined.marks
1534'
1535
1536cat >input <<EOF
1537feature relative-marks
1538feature import-marks=relative.in
1539feature export-marks=relative.out
1540EOF
1541
1542test_expect_success 'R: feature relative-marks should be honoured' '
1543    mkdir -p .git/info/fast-import/ &&
1544    cp marks.new .git/info/fast-import/relative.in &&
1545    git fast-import <input &&
1546    test_cmp marks.new .git/info/fast-import/relative.out
1547'
1548
1549cat >input <<EOF
1550feature relative-marks
1551feature import-marks=relative.in
1552feature no-relative-marks
1553feature export-marks=non-relative.out
1554EOF
1555
1556test_expect_success 'R: feature no-relative-marks should be honoured' '
1557    git fast-import <input &&
1558    test_cmp marks.new non-relative.out
1559'
1560
1561cat >input << EOF
1562option git quiet
1563blob
1564data 3
1565hi
1566
1567EOF
1568
1569touch empty
1570
1571test_expect_success 'R: quiet option results in no stats being output' '
1572    cat input | git fast-import 2> output &&
1573    test_cmp empty output
1574'
1575
1576cat >input <<EOF
1577option git non-existing-option
1578EOF
1579
1580test_expect_success 'R: die on unknown option' '
1581    test_must_fail git fast-import <input
1582'
1583
1584test_expect_success 'R: unknown commandline options are rejected' '\
1585    test_must_fail git fast-import --non-existing-option < /dev/null
1586'
1587
1588cat >input <<EOF
1589option non-existing-vcs non-existing-option
1590EOF
1591
1592test_expect_success 'R: ignore non-git options' '
1593    git fast-import <input
1594'
1595
1596##
1597## R: very large blobs
1598##
1599blobsize=$((2*1024*1024 + 53))
1600test-genrandom bar $blobsize >expect
1601cat >input <<INPUT_END
1602commit refs/heads/big-file
1603committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1604data <<COMMIT
1605R - big file
1606COMMIT
1607
1608M 644 inline big1
1609data $blobsize
1610INPUT_END
1611cat expect >>input
1612cat >>input <<INPUT_END
1613M 644 inline big2
1614data $blobsize
1615INPUT_END
1616cat expect >>input
1617echo >>input
1618
1619test_expect_success \
1620        'R: blob bigger than threshold' \
1621        'test_create_repo R &&
1622         git --git-dir=R/.git fast-import --big-file-threshold=1 <input'
1623test_expect_success \
1624        'R: verify created pack' \
1625        ': >verify &&
1626         for p in R/.git/objects/pack/*.pack;
1627         do
1628           git verify-pack -v $p >>verify || exit;
1629         done'
1630test_expect_success \
1631        'R: verify written objects' \
1632        'git --git-dir=R/.git cat-file blob big-file:big1 >actual &&
1633         test_cmp expect actual &&
1634         a=$(git --git-dir=R/.git rev-parse big-file:big1) &&
1635         b=$(git --git-dir=R/.git rev-parse big-file:big2) &&
1636         test $a = $b'
1637test_expect_success \
1638        'R: blob appears only once' \
1639        'n=$(grep $a verify | wc -l) &&
1640         test 1 = $n'
1641
1642test_done