Andrew's git / gitweb.git / t/t9300-fast-import.sh
?
t / t9300-fast-import.shon commit Several tests: cd inside subshell instead of around (fd4ec4f)
   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         git submodule init &&
1064         git submodule update'
1065
1066SUBLAST=$(git rev-parse --verify sub)
1067SUBPREV=$(git rev-parse --verify sub^)
1068
1069cat >input <<INPUT_END
1070blob
1071mark :1
1072data <<DATAEND
1073[submodule "sub"]
1074        path = sub
1075        url = "`pwd`/sub"
1076DATAEND
1077
1078commit refs/heads/subuse2
1079mark :2
1080committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1081data 8
1082initial
1083from refs/heads/master
1084M 100644 :1 .gitmodules
1085M 160000 $SUBPREV sub
1086
1087commit refs/heads/subuse2
1088mark :3
1089committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1090data 7
1091second
1092from :2
1093M 160000 $SUBLAST sub
1094
1095INPUT_END
1096
1097test_expect_success \
1098        'P: verbatim SHA gitlinks' \
1099        'git branch -D sub &&
1100         git gc && git prune &&
1101         git fast-import <input &&
1102         test $(git rev-parse --verify subuse2) = $(git rev-parse --verify subuse1)'
1103
1104test_tick
1105cat >input <<INPUT_END
1106commit refs/heads/subuse3
1107mark :1
1108committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1109data <<COMMIT
1110corrupt
1111COMMIT
1112
1113from refs/heads/subuse2
1114M 160000 inline sub
1115data <<DATA
1116$SUBPREV
1117DATA
1118
1119INPUT_END
1120
1121test_expect_success 'P: fail on inline gitlink' '
1122    test_must_fail git fast-import <input'
1123
1124test_tick
1125cat >input <<INPUT_END
1126blob
1127mark :1
1128data <<DATA
1129$SUBPREV
1130DATA
1131
1132commit refs/heads/subuse3
1133mark :2
1134committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1135data <<COMMIT
1136corrupt
1137COMMIT
1138
1139from refs/heads/subuse2
1140M 160000 :1 sub
1141
1142INPUT_END
1143
1144test_expect_success 'P: fail on blob mark in gitlink' '
1145    test_must_fail git fast-import <input'
1146
1147###
1148### series Q (notes)
1149###
1150
1151note1_data="The first note for the first commit"
1152note2_data="The first note for the second commit"
1153note3_data="The first note for the third commit"
1154note1b_data="The second note for the first commit"
1155note1c_data="The third note for the first commit"
1156note2b_data="The second note for the second commit"
1157
1158test_tick
1159cat >input <<INPUT_END
1160blob
1161mark :2
1162data <<EOF
1163$file2_data
1164EOF
1165
1166commit refs/heads/notes-test
1167mark :3
1168committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1169data <<COMMIT
1170first (:3)
1171COMMIT
1172
1173M 644 :2 file2
1174
1175blob
1176mark :4
1177data $file4_len
1178$file4_data
1179commit refs/heads/notes-test
1180mark :5
1181committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1182data <<COMMIT
1183second (:5)
1184COMMIT
1185
1186M 644 :4 file4
1187
1188commit refs/heads/notes-test
1189mark :6
1190committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1191data <<COMMIT
1192third (:6)
1193COMMIT
1194
1195M 644 inline file5
1196data <<EOF
1197$file5_data
1198EOF
1199
1200M 755 inline file6
1201data <<EOF
1202$file6_data
1203EOF
1204
1205blob
1206mark :7
1207data <<EOF
1208$note1_data
1209EOF
1210
1211blob
1212mark :8
1213data <<EOF
1214$note2_data
1215EOF
1216
1217commit refs/notes/foobar
1218mark :9
1219committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1220data <<COMMIT
1221notes (:9)
1222COMMIT
1223
1224N :7 :3
1225N :8 :5
1226N inline :6
1227data <<EOF
1228$note3_data
1229EOF
1230
1231commit refs/notes/foobar
1232mark :10
1233committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1234data <<COMMIT
1235notes (:10)
1236COMMIT
1237
1238N inline :3
1239data <<EOF
1240$note1b_data
1241EOF
1242
1243commit refs/notes/foobar2
1244mark :11
1245committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1246data <<COMMIT
1247notes (:11)
1248COMMIT
1249
1250N inline :3
1251data <<EOF
1252$note1c_data
1253EOF
1254
1255commit refs/notes/foobar
1256mark :12
1257committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1258data <<COMMIT
1259notes (:12)
1260COMMIT
1261
1262deleteall
1263N inline :5
1264data <<EOF
1265$note2b_data
1266EOF
1267
1268INPUT_END
1269
1270test_expect_success \
1271        'Q: commit notes' \
1272        'git fast-import <input &&
1273         git whatchanged notes-test'
1274test_expect_success \
1275        'Q: verify pack' \
1276        'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'
1277
1278commit1=$(git rev-parse notes-test~2)
1279commit2=$(git rev-parse notes-test^)
1280commit3=$(git rev-parse notes-test)
1281
1282cat >expect <<EOF
1283author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1284committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1285
1286first (:3)
1287EOF
1288test_expect_success \
1289        'Q: verify first commit' \
1290        'git cat-file commit notes-test~2 | sed 1d >actual &&
1291        test_cmp expect actual'
1292
1293cat >expect <<EOF
1294parent $commit1
1295author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1296committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1297
1298second (:5)
1299EOF
1300test_expect_success \
1301        'Q: verify second commit' \
1302        'git cat-file commit notes-test^ | sed 1d >actual &&
1303        test_cmp expect actual'
1304
1305cat >expect <<EOF
1306parent $commit2
1307author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1308committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1309
1310third (:6)
1311EOF
1312test_expect_success \
1313        'Q: verify third commit' \
1314        'git cat-file commit notes-test | sed 1d >actual &&
1315        test_cmp expect actual'
1316
1317cat >expect <<EOF
1318author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1319committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1320
1321notes (:9)
1322EOF
1323test_expect_success \
1324        'Q: verify first notes commit' \
1325        'git cat-file commit refs/notes/foobar~2 | sed 1d >actual &&
1326        test_cmp expect actual'
1327
1328cat >expect.unsorted <<EOF
1329100644 blob $commit1
1330100644 blob $commit2
1331100644 blob $commit3
1332EOF
1333cat expect.unsorted | sort >expect
1334test_expect_success \
1335        'Q: verify first notes tree' \
1336        'git cat-file -p refs/notes/foobar~2^{tree} | sed "s/ [0-9a-f]* / /" >actual &&
1337         test_cmp expect actual'
1338
1339echo "$note1_data" >expect
1340test_expect_success \
1341        'Q: verify first note for first commit' \
1342        'git cat-file blob refs/notes/foobar~2:$commit1 >actual && test_cmp expect actual'
1343
1344echo "$note2_data" >expect
1345test_expect_success \
1346        'Q: verify first note for second commit' \
1347        'git cat-file blob refs/notes/foobar~2:$commit2 >actual && test_cmp expect actual'
1348
1349echo "$note3_data" >expect
1350test_expect_success \
1351        'Q: verify first note for third commit' \
1352        'git cat-file blob refs/notes/foobar~2:$commit3 >actual && test_cmp expect actual'
1353
1354cat >expect <<EOF
1355parent `git rev-parse --verify refs/notes/foobar~2`
1356author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1357committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1358
1359notes (:10)
1360EOF
1361test_expect_success \
1362        'Q: verify second notes commit' \
1363        'git cat-file commit refs/notes/foobar^ | sed 1d >actual &&
1364        test_cmp expect actual'
1365
1366cat >expect.unsorted <<EOF
1367100644 blob $commit1
1368100644 blob $commit2
1369100644 blob $commit3
1370EOF
1371cat expect.unsorted | sort >expect
1372test_expect_success \
1373        'Q: verify second notes tree' \
1374        'git cat-file -p refs/notes/foobar^^{tree} | sed "s/ [0-9a-f]*  / /" >actual &&
1375         test_cmp expect actual'
1376
1377echo "$note1b_data" >expect
1378test_expect_success \
1379        'Q: verify second note for first commit' \
1380        'git cat-file blob refs/notes/foobar^:$commit1 >actual && test_cmp expect actual'
1381
1382echo "$note2_data" >expect
1383test_expect_success \
1384        'Q: verify first note for second commit' \
1385        'git cat-file blob refs/notes/foobar^:$commit2 >actual && test_cmp expect actual'
1386
1387echo "$note3_data" >expect
1388test_expect_success \
1389        'Q: verify first note for third commit' \
1390        'git cat-file blob refs/notes/foobar^:$commit3 >actual && test_cmp expect actual'
1391
1392cat >expect <<EOF
1393author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1394committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1395
1396notes (:11)
1397EOF
1398test_expect_success \
1399        'Q: verify third notes commit' \
1400        'git cat-file commit refs/notes/foobar2 | sed 1d >actual &&
1401        test_cmp expect actual'
1402
1403cat >expect.unsorted <<EOF
1404100644 blob $commit1
1405EOF
1406cat expect.unsorted | sort >expect
1407test_expect_success \
1408        'Q: verify third notes tree' \
1409        'git cat-file -p refs/notes/foobar2^{tree} | sed "s/ [0-9a-f]*  / /" >actual &&
1410         test_cmp expect actual'
1411
1412echo "$note1c_data" >expect
1413test_expect_success \
1414        'Q: verify third note for first commit' \
1415        'git cat-file blob refs/notes/foobar2:$commit1 >actual && test_cmp expect actual'
1416
1417cat >expect <<EOF
1418parent `git rev-parse --verify refs/notes/foobar^`
1419author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1420committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1421
1422notes (:12)
1423EOF
1424test_expect_success \
1425        'Q: verify fourth notes commit' \
1426        'git cat-file commit refs/notes/foobar | sed 1d >actual &&
1427        test_cmp expect actual'
1428
1429cat >expect.unsorted <<EOF
1430100644 blob $commit2
1431EOF
1432cat expect.unsorted | sort >expect
1433test_expect_success \
1434        'Q: verify fourth notes tree' \
1435        'git cat-file -p refs/notes/foobar^{tree} | sed "s/ [0-9a-f]*   / /" >actual &&
1436         test_cmp expect actual'
1437
1438echo "$note2b_data" >expect
1439test_expect_success \
1440        'Q: verify second note for second commit' \
1441        'git cat-file blob refs/notes/foobar:$commit2 >actual && test_cmp expect actual'
1442
1443###
1444### series R (feature and option)
1445###
1446
1447cat >input <<EOF
1448feature no-such-feature-exists
1449EOF
1450
1451test_expect_success 'R: abort on unsupported feature' '
1452        test_must_fail git fast-import <input
1453'
1454
1455cat >input <<EOF
1456feature date-format=now
1457EOF
1458
1459test_expect_success 'R: supported feature is accepted' '
1460        git fast-import <input
1461'
1462
1463cat >input << EOF
1464blob
1465data 3
1466hi
1467feature date-format=now
1468EOF
1469
1470test_expect_success 'R: abort on receiving feature after data command' '
1471        test_must_fail git fast-import <input
1472'
1473
1474cat >input << EOF
1475feature import-marks=git.marks
1476feature import-marks=git2.marks
1477EOF
1478
1479test_expect_success 'R: only one import-marks feature allowed per stream' '
1480        test_must_fail git fast-import <input
1481'
1482
1483cat >input << EOF
1484feature export-marks=git.marks
1485blob
1486mark :1
1487data 3
1488hi
1489
1490EOF
1491
1492test_expect_success \
1493    'R: export-marks feature results in a marks file being created' \
1494    'cat input | git fast-import &&
1495    grep :1 git.marks'
1496
1497test_expect_success \
1498    'R: export-marks options can be overriden by commandline options' \
1499    'cat input | git fast-import --export-marks=other.marks &&
1500    grep :1 other.marks'
1501
1502cat >input << EOF
1503feature import-marks=marks.out
1504feature export-marks=marks.new
1505EOF
1506
1507test_expect_success \
1508    'R: import to output marks works without any content' \
1509    'cat input | git fast-import &&
1510    test_cmp marks.out marks.new'
1511
1512cat >input <<EOF
1513feature import-marks=nonexistant.marks
1514feature export-marks=marks.new
1515EOF
1516
1517test_expect_success \
1518    'R: import marks prefers commandline marks file over the stream' \
1519    'cat input | git fast-import --import-marks=marks.out &&
1520    test_cmp marks.out marks.new'
1521
1522
1523cat >input <<EOF
1524feature import-marks=nonexistant.marks
1525feature export-marks=combined.marks
1526EOF
1527
1528test_expect_success 'R: multiple --import-marks= should be honoured' '
1529    head -n2 marks.out > one.marks &&
1530    tail -n +3 marks.out > two.marks &&
1531    git fast-import --import-marks=one.marks --import-marks=two.marks <input &&
1532    test_cmp marks.out combined.marks
1533'
1534
1535cat >input <<EOF
1536feature relative-marks
1537feature import-marks=relative.in
1538feature export-marks=relative.out
1539EOF
1540
1541test_expect_success 'R: feature relative-marks should be honoured' '
1542    mkdir -p .git/info/fast-import/ &&
1543    cp marks.new .git/info/fast-import/relative.in &&
1544    git fast-import <input &&
1545    test_cmp marks.new .git/info/fast-import/relative.out
1546'
1547
1548cat >input <<EOF
1549feature relative-marks
1550feature import-marks=relative.in
1551feature no-relative-marks
1552feature export-marks=non-relative.out
1553EOF
1554
1555test_expect_success 'R: feature no-relative-marks should be honoured' '
1556    git fast-import <input &&
1557    test_cmp marks.new non-relative.out
1558'
1559
1560cat >input << EOF
1561option git quiet
1562blob
1563data 3
1564hi
1565
1566EOF
1567
1568touch empty
1569
1570test_expect_success 'R: quiet option results in no stats being output' '
1571    cat input | git fast-import 2> output &&
1572    test_cmp empty output
1573'
1574
1575cat >input <<EOF
1576option git non-existing-option
1577EOF
1578
1579test_expect_success 'R: die on unknown option' '
1580    test_must_fail git fast-import <input
1581'
1582
1583test_expect_success 'R: unknown commandline options are rejected' '\
1584    test_must_fail git fast-import --non-existing-option < /dev/null
1585'
1586
1587cat >input <<EOF
1588option non-existing-vcs non-existing-option
1589EOF
1590
1591test_expect_success 'R: ignore non-git options' '
1592    git fast-import <input
1593'
1594
1595##
1596## R: very large blobs
1597##
1598blobsize=$((2*1024*1024 + 53))
1599test-genrandom bar $blobsize >expect
1600cat >input <<INPUT_END
1601commit refs/heads/big-file
1602committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1603data <<COMMIT
1604R - big file
1605COMMIT
1606
1607M 644 inline big1
1608data $blobsize
1609INPUT_END
1610cat expect >>input
1611cat >>input <<INPUT_END
1612M 644 inline big2
1613data $blobsize
1614INPUT_END
1615cat expect >>input
1616echo >>input
1617
1618test_expect_success \
1619        'R: blob bigger than threshold' \
1620        'test_create_repo R &&
1621         git --git-dir=R/.git fast-import --big-file-threshold=1 <input'
1622test_expect_success \
1623        'R: verify created pack' \
1624        ': >verify &&
1625         for p in R/.git/objects/pack/*.pack;
1626         do
1627           git verify-pack -v $p >>verify || exit;
1628         done'
1629test_expect_success \
1630        'R: verify written objects' \
1631        'git --git-dir=R/.git cat-file blob big-file:big1 >actual &&
1632         test_cmp expect actual &&
1633         a=$(git --git-dir=R/.git rev-parse big-file:big1) &&
1634         b=$(git --git-dir=R/.git rev-parse big-file:big2) &&
1635         test $a = $b'
1636test_expect_success \
1637        'R: blob appears only once' \
1638        'n=$(grep $a verify | wc -l) &&
1639         test 1 = $n'
1640
1641test_done