Andrew's git / gitweb.git / t/t9300-fast-import.sh
?
t / t9300-fast-import.shon commit fast-import: tighten M 040000 syntax (3421578)
   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
 856test_expect_success \
 857        'N: copy directory by id' \
 858        'cat >expect <<-\EOF &&
 859        :100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc C100   file2/newf      file3/newf
 860        :100644 100644 7123f7f44e39be127c5eb701e5968176ee9d78b1 7123f7f44e39be127c5eb701e5968176ee9d78b1 C100   file2/oldf      file3/oldf
 861        EOF
 862         subdir=$(git rev-parse refs/heads/branch^0:file2) &&
 863         cat >input <<-INPUT_END &&
 864        commit refs/heads/N4
 865        committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 866        data <<COMMIT
 867        copy by tree hash
 868        COMMIT
 869
 870        from refs/heads/branch^0
 871        M 040000 $subdir file3
 872        INPUT_END
 873         git fast-import <input &&
 874         git diff-tree -C --find-copies-harder -r N4^ N4 >actual &&
 875         compare_diff_raw expect actual'
 876
 877test_expect_success \
 878        'N: copy root directory by tree hash' \
 879        'cat >expect <<-\EOF &&
 880        :100755 000000 f1fb5da718392694d0076d677d6d0e364c79b0bc 0000000000000000000000000000000000000000 D      file3/newf
 881        :100644 000000 7123f7f44e39be127c5eb701e5968176ee9d78b1 0000000000000000000000000000000000000000 D      file3/oldf
 882        EOF
 883         root=$(git rev-parse refs/heads/branch^0^{tree}) &&
 884         cat >input <<-INPUT_END &&
 885        commit refs/heads/N6
 886        committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 887        data <<COMMIT
 888        copy root directory by tree hash
 889        COMMIT
 890
 891        from refs/heads/branch^0
 892        M 040000 $root ""
 893        INPUT_END
 894         git fast-import <input &&
 895         git diff-tree -C --find-copies-harder -r N4 N6 >actual &&
 896         compare_diff_raw expect actual'
 897
 898test_expect_success \
 899        'N: modify copied tree' \
 900        'cat >expect <<-\EOF &&
 901        :100644 100644 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 C100   newdir/interesting      file3/file5
 902        :100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc C100   file2/newf      file3/newf
 903        :100644 100644 7123f7f44e39be127c5eb701e5968176ee9d78b1 7123f7f44e39be127c5eb701e5968176ee9d78b1 C100   file2/oldf      file3/oldf
 904        EOF
 905         subdir=$(git rev-parse refs/heads/branch^0:file2) &&
 906         cat >input <<-INPUT_END &&
 907        commit refs/heads/N5
 908        committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 909        data <<COMMIT
 910        copy by tree hash
 911        COMMIT
 912
 913        from refs/heads/branch^0
 914        M 040000 $subdir file3
 915
 916        commit refs/heads/N5
 917        committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 918        data <<COMMIT
 919        modify directory copy
 920        COMMIT
 921
 922        M 644 inline file3/file5
 923        data <<EOF
 924        $file5_data
 925        EOF
 926        INPUT_END
 927         git fast-import <input &&
 928         git diff-tree -C --find-copies-harder -r N5^^ N5 >actual &&
 929         compare_diff_raw expect actual'
 930
 931test_expect_success \
 932        'N: reject foo/ syntax' \
 933        'subdir=$(git rev-parse refs/heads/branch^0:file2) &&
 934         test_must_fail git fast-import <<-INPUT_END
 935        commit refs/heads/N5B
 936        committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 937        data <<COMMIT
 938        copy with invalid syntax
 939        COMMIT
 940
 941        from refs/heads/branch^0
 942        M 040000 $subdir file3/
 943        INPUT_END'
 944
 945test_expect_success \
 946        'N: copy to root by id and modify' \
 947        'echo "hello, world" >expect.foo &&
 948         echo hello >expect.bar &&
 949         git fast-import <<-SETUP_END &&
 950        commit refs/heads/N7
 951        committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 952        data <<COMMIT
 953        hello, tree
 954        COMMIT
 955
 956        deleteall
 957        M 644 inline foo/bar
 958        data <<EOF
 959        hello
 960        EOF
 961        SETUP_END
 962
 963         tree=$(git rev-parse --verify N7:) &&
 964         git fast-import <<-INPUT_END &&
 965        commit refs/heads/N8
 966        committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 967        data <<COMMIT
 968        copy to root by id and modify
 969        COMMIT
 970
 971        M 040000 $tree ""
 972        M 644 inline foo/foo
 973        data <<EOF
 974        hello, world
 975        EOF
 976        INPUT_END
 977         git show N8:foo/foo >actual.foo &&
 978         git show N8:foo/bar >actual.bar &&
 979         test_cmp expect.foo actual.foo &&
 980         test_cmp expect.bar actual.bar'
 981
 982test_expect_success \
 983        'N: extract subtree' \
 984        'branch=$(git rev-parse --verify refs/heads/branch^{tree}) &&
 985         cat >input <<-INPUT_END &&
 986        commit refs/heads/N9
 987        committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 988        data <<COMMIT
 989        extract subtree branch:newdir
 990        COMMIT
 991
 992        M 040000 $branch ""
 993        R "newdir" ""
 994        INPUT_END
 995         git fast-import <input &&
 996         git diff --exit-code branch:newdir N9'
 997
 998###
 999### series O
1000###
1001
1002cat >input <<INPUT_END
1003#we will
1004commit refs/heads/O1
1005# -- ignore all of this text
1006committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1007# $GIT_COMMITTER_NAME has inserted here for his benefit.
1008data <<COMMIT
1009dirty directory copy
1010COMMIT
1011
1012# don't forget the import blank line!
1013#
1014# yes, we started from our usual base of branch^0.
1015# i like branch^0.
1016from refs/heads/branch^0
1017# and we need to reuse file2/file5 from N3 above.
1018M 644 inline file2/file5
1019# otherwise the tree will be different
1020data <<EOF
1021$file5_data
1022EOF
1023
1024# don't forget to copy file2 to file3
1025C file2 file3
1026#
1027# or to delete file5 from file2.
1028D file2/file5
1029# are we done yet?
1030
1031INPUT_END
1032
1033test_expect_success \
1034        'O: comments are all skipped' \
1035        'git fast-import <input &&
1036         test `git rev-parse N3` = `git rev-parse O1`'
1037
1038cat >input <<INPUT_END
1039commit refs/heads/O2
1040committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1041data <<COMMIT
1042dirty directory copy
1043COMMIT
1044from refs/heads/branch^0
1045M 644 inline file2/file5
1046data <<EOF
1047$file5_data
1048EOF
1049C file2 file3
1050D file2/file5
1051
1052INPUT_END
1053
1054test_expect_success \
1055        'O: blank lines not necessary after data commands' \
1056        'git fast-import <input &&
1057         test `git rev-parse N3` = `git rev-parse O2`'
1058
1059test_expect_success \
1060        'O: repack before next test' \
1061        'git repack -a -d'
1062
1063cat >input <<INPUT_END
1064commit refs/heads/O3
1065committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1066data <<COMMIT
1067zstring
1068COMMIT
1069commit refs/heads/O3
1070committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1071data <<COMMIT
1072zof
1073COMMIT
1074checkpoint
1075commit refs/heads/O3
1076mark :5
1077committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1078data <<COMMIT
1079zempty
1080COMMIT
1081checkpoint
1082commit refs/heads/O3
1083committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1084data <<COMMIT
1085zcommits
1086COMMIT
1087reset refs/tags/O3-2nd
1088from :5
1089reset refs/tags/O3-3rd
1090from :5
1091INPUT_END
1092
1093cat >expect <<INPUT_END
1094string
1095of
1096empty
1097commits
1098INPUT_END
1099test_expect_success \
1100        'O: blank lines not necessary after other commands' \
1101        'git fast-import <input &&
1102         test 8 = `find .git/objects/pack -type f | wc -l` &&
1103         test `git rev-parse refs/tags/O3-2nd` = `git rev-parse O3^` &&
1104         git log --reverse --pretty=oneline O3 | sed s/^.*z// >actual &&
1105         test_cmp expect actual'
1106
1107cat >input <<INPUT_END
1108commit refs/heads/O4
1109committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1110data <<COMMIT
1111zstring
1112COMMIT
1113commit refs/heads/O4
1114committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1115data <<COMMIT
1116zof
1117COMMIT
1118progress Two commits down, 2 to go!
1119commit refs/heads/O4
1120committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1121data <<COMMIT
1122zempty
1123COMMIT
1124progress Three commits down, 1 to go!
1125commit refs/heads/O4
1126committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1127data <<COMMIT
1128zcommits
1129COMMIT
1130progress I'm done!
1131INPUT_END
1132test_expect_success \
1133        'O: progress outputs as requested by input' \
1134        'git fast-import <input >actual &&
1135         grep "progress " <input >expect &&
1136         test_cmp expect actual'
1137
1138###
1139### series P (gitlinks)
1140###
1141
1142cat >input <<INPUT_END
1143blob
1144mark :1
1145data 10
1146test file
1147
1148reset refs/heads/sub
1149commit refs/heads/sub
1150mark :2
1151committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1152data 12
1153sub_initial
1154M 100644 :1 file
1155
1156blob
1157mark :3
1158data <<DATAEND
1159[submodule "sub"]
1160        path = sub
1161        url = "`pwd`/sub"
1162DATAEND
1163
1164commit refs/heads/subuse1
1165mark :4
1166committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1167data 8
1168initial
1169from refs/heads/master
1170M 100644 :3 .gitmodules
1171M 160000 :2 sub
1172
1173blob
1174mark :5
1175data 20
1176test file
1177more data
1178
1179commit refs/heads/sub
1180mark :6
1181committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1182data 11
1183sub_second
1184from :2
1185M 100644 :5 file
1186
1187commit refs/heads/subuse1
1188mark :7
1189committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1190data 7
1191second
1192from :4
1193M 160000 :6 sub
1194
1195INPUT_END
1196
1197test_expect_success \
1198        'P: supermodule & submodule mix' \
1199        'git fast-import <input &&
1200         git checkout subuse1 &&
1201         rm -rf sub && mkdir sub && (cd sub &&
1202         git init &&
1203         git fetch --update-head-ok .. refs/heads/sub:refs/heads/master &&
1204         git checkout master) &&
1205         git submodule init &&
1206         git submodule update'
1207
1208SUBLAST=$(git rev-parse --verify sub)
1209SUBPREV=$(git rev-parse --verify sub^)
1210
1211cat >input <<INPUT_END
1212blob
1213mark :1
1214data <<DATAEND
1215[submodule "sub"]
1216        path = sub
1217        url = "`pwd`/sub"
1218DATAEND
1219
1220commit refs/heads/subuse2
1221mark :2
1222committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1223data 8
1224initial
1225from refs/heads/master
1226M 100644 :1 .gitmodules
1227M 160000 $SUBPREV sub
1228
1229commit refs/heads/subuse2
1230mark :3
1231committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1232data 7
1233second
1234from :2
1235M 160000 $SUBLAST sub
1236
1237INPUT_END
1238
1239test_expect_success \
1240        'P: verbatim SHA gitlinks' \
1241        'git branch -D sub &&
1242         git gc && git prune &&
1243         git fast-import <input &&
1244         test $(git rev-parse --verify subuse2) = $(git rev-parse --verify subuse1)'
1245
1246test_tick
1247cat >input <<INPUT_END
1248commit refs/heads/subuse3
1249mark :1
1250committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1251data <<COMMIT
1252corrupt
1253COMMIT
1254
1255from refs/heads/subuse2
1256M 160000 inline sub
1257data <<DATA
1258$SUBPREV
1259DATA
1260
1261INPUT_END
1262
1263test_expect_success 'P: fail on inline gitlink' '
1264    test_must_fail git fast-import <input'
1265
1266test_tick
1267cat >input <<INPUT_END
1268blob
1269mark :1
1270data <<DATA
1271$SUBPREV
1272DATA
1273
1274commit refs/heads/subuse3
1275mark :2
1276committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1277data <<COMMIT
1278corrupt
1279COMMIT
1280
1281from refs/heads/subuse2
1282M 160000 :1 sub
1283
1284INPUT_END
1285
1286test_expect_success 'P: fail on blob mark in gitlink' '
1287    test_must_fail git fast-import <input'
1288
1289###
1290### series Q (notes)
1291###
1292
1293note1_data="The first note for the first commit"
1294note2_data="The first note for the second commit"
1295note3_data="The first note for the third commit"
1296note1b_data="The second note for the first commit"
1297note1c_data="The third note for the first commit"
1298note2b_data="The second note for the second commit"
1299
1300test_tick
1301cat >input <<INPUT_END
1302blob
1303mark :2
1304data <<EOF
1305$file2_data
1306EOF
1307
1308commit refs/heads/notes-test
1309mark :3
1310committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1311data <<COMMIT
1312first (:3)
1313COMMIT
1314
1315M 644 :2 file2
1316
1317blob
1318mark :4
1319data $file4_len
1320$file4_data
1321commit refs/heads/notes-test
1322mark :5
1323committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1324data <<COMMIT
1325second (:5)
1326COMMIT
1327
1328M 644 :4 file4
1329
1330commit refs/heads/notes-test
1331mark :6
1332committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1333data <<COMMIT
1334third (:6)
1335COMMIT
1336
1337M 644 inline file5
1338data <<EOF
1339$file5_data
1340EOF
1341
1342M 755 inline file6
1343data <<EOF
1344$file6_data
1345EOF
1346
1347blob
1348mark :7
1349data <<EOF
1350$note1_data
1351EOF
1352
1353blob
1354mark :8
1355data <<EOF
1356$note2_data
1357EOF
1358
1359commit refs/notes/foobar
1360mark :9
1361committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1362data <<COMMIT
1363notes (:9)
1364COMMIT
1365
1366N :7 :3
1367N :8 :5
1368N inline :6
1369data <<EOF
1370$note3_data
1371EOF
1372
1373commit refs/notes/foobar
1374mark :10
1375committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1376data <<COMMIT
1377notes (:10)
1378COMMIT
1379
1380N inline :3
1381data <<EOF
1382$note1b_data
1383EOF
1384
1385commit refs/notes/foobar2
1386mark :11
1387committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1388data <<COMMIT
1389notes (:11)
1390COMMIT
1391
1392N inline :3
1393data <<EOF
1394$note1c_data
1395EOF
1396
1397commit refs/notes/foobar
1398mark :12
1399committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1400data <<COMMIT
1401notes (:12)
1402COMMIT
1403
1404deleteall
1405N inline :5
1406data <<EOF
1407$note2b_data
1408EOF
1409
1410INPUT_END
1411
1412test_expect_success \
1413        'Q: commit notes' \
1414        'git fast-import <input &&
1415         git whatchanged notes-test'
1416test_expect_success \
1417        'Q: verify pack' \
1418        'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'
1419
1420commit1=$(git rev-parse notes-test~2)
1421commit2=$(git rev-parse notes-test^)
1422commit3=$(git rev-parse notes-test)
1423
1424cat >expect <<EOF
1425author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1426committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1427
1428first (:3)
1429EOF
1430test_expect_success \
1431        'Q: verify first commit' \
1432        'git cat-file commit notes-test~2 | sed 1d >actual &&
1433        test_cmp expect actual'
1434
1435cat >expect <<EOF
1436parent $commit1
1437author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1438committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1439
1440second (:5)
1441EOF
1442test_expect_success \
1443        'Q: verify second commit' \
1444        'git cat-file commit notes-test^ | sed 1d >actual &&
1445        test_cmp expect actual'
1446
1447cat >expect <<EOF
1448parent $commit2
1449author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1450committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1451
1452third (:6)
1453EOF
1454test_expect_success \
1455        'Q: verify third commit' \
1456        'git cat-file commit notes-test | sed 1d >actual &&
1457        test_cmp expect actual'
1458
1459cat >expect <<EOF
1460author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1461committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1462
1463notes (:9)
1464EOF
1465test_expect_success \
1466        'Q: verify first notes commit' \
1467        'git cat-file commit refs/notes/foobar~2 | sed 1d >actual &&
1468        test_cmp expect actual'
1469
1470cat >expect.unsorted <<EOF
1471100644 blob $commit1
1472100644 blob $commit2
1473100644 blob $commit3
1474EOF
1475cat expect.unsorted | sort >expect
1476test_expect_success \
1477        'Q: verify first notes tree' \
1478        'git cat-file -p refs/notes/foobar~2^{tree} | sed "s/ [0-9a-f]* / /" >actual &&
1479         test_cmp expect actual'
1480
1481echo "$note1_data" >expect
1482test_expect_success \
1483        'Q: verify first note for first commit' \
1484        'git cat-file blob refs/notes/foobar~2:$commit1 >actual && test_cmp expect actual'
1485
1486echo "$note2_data" >expect
1487test_expect_success \
1488        'Q: verify first note for second commit' \
1489        'git cat-file blob refs/notes/foobar~2:$commit2 >actual && test_cmp expect actual'
1490
1491echo "$note3_data" >expect
1492test_expect_success \
1493        'Q: verify first note for third commit' \
1494        'git cat-file blob refs/notes/foobar~2:$commit3 >actual && test_cmp expect actual'
1495
1496cat >expect <<EOF
1497parent `git rev-parse --verify refs/notes/foobar~2`
1498author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1499committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1500
1501notes (:10)
1502EOF
1503test_expect_success \
1504        'Q: verify second notes commit' \
1505        'git cat-file commit refs/notes/foobar^ | sed 1d >actual &&
1506        test_cmp expect actual'
1507
1508cat >expect.unsorted <<EOF
1509100644 blob $commit1
1510100644 blob $commit2
1511100644 blob $commit3
1512EOF
1513cat expect.unsorted | sort >expect
1514test_expect_success \
1515        'Q: verify second notes tree' \
1516        'git cat-file -p refs/notes/foobar^^{tree} | sed "s/ [0-9a-f]*  / /" >actual &&
1517         test_cmp expect actual'
1518
1519echo "$note1b_data" >expect
1520test_expect_success \
1521        'Q: verify second note for first commit' \
1522        'git cat-file blob refs/notes/foobar^:$commit1 >actual && test_cmp expect actual'
1523
1524echo "$note2_data" >expect
1525test_expect_success \
1526        'Q: verify first note for second commit' \
1527        'git cat-file blob refs/notes/foobar^:$commit2 >actual && test_cmp expect actual'
1528
1529echo "$note3_data" >expect
1530test_expect_success \
1531        'Q: verify first note for third commit' \
1532        'git cat-file blob refs/notes/foobar^:$commit3 >actual && test_cmp expect actual'
1533
1534cat >expect <<EOF
1535author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1536committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1537
1538notes (:11)
1539EOF
1540test_expect_success \
1541        'Q: verify third notes commit' \
1542        'git cat-file commit refs/notes/foobar2 | sed 1d >actual &&
1543        test_cmp expect actual'
1544
1545cat >expect.unsorted <<EOF
1546100644 blob $commit1
1547EOF
1548cat expect.unsorted | sort >expect
1549test_expect_success \
1550        'Q: verify third notes tree' \
1551        'git cat-file -p refs/notes/foobar2^{tree} | sed "s/ [0-9a-f]*  / /" >actual &&
1552         test_cmp expect actual'
1553
1554echo "$note1c_data" >expect
1555test_expect_success \
1556        'Q: verify third note for first commit' \
1557        'git cat-file blob refs/notes/foobar2:$commit1 >actual && test_cmp expect actual'
1558
1559cat >expect <<EOF
1560parent `git rev-parse --verify refs/notes/foobar^`
1561author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1562committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1563
1564notes (:12)
1565EOF
1566test_expect_success \
1567        'Q: verify fourth notes commit' \
1568        'git cat-file commit refs/notes/foobar | sed 1d >actual &&
1569        test_cmp expect actual'
1570
1571cat >expect.unsorted <<EOF
1572100644 blob $commit2
1573EOF
1574cat expect.unsorted | sort >expect
1575test_expect_success \
1576        'Q: verify fourth notes tree' \
1577        'git cat-file -p refs/notes/foobar^{tree} | sed "s/ [0-9a-f]*   / /" >actual &&
1578         test_cmp expect actual'
1579
1580echo "$note2b_data" >expect
1581test_expect_success \
1582        'Q: verify second note for second commit' \
1583        'git cat-file blob refs/notes/foobar:$commit2 >actual && test_cmp expect actual'
1584
1585###
1586### series R (feature and option)
1587###
1588
1589cat >input <<EOF
1590feature no-such-feature-exists
1591EOF
1592
1593test_expect_success 'R: abort on unsupported feature' '
1594        test_must_fail git fast-import <input
1595'
1596
1597cat >input <<EOF
1598feature date-format=now
1599EOF
1600
1601test_expect_success 'R: supported feature is accepted' '
1602        git fast-import <input
1603'
1604
1605cat >input << EOF
1606blob
1607data 3
1608hi
1609feature date-format=now
1610EOF
1611
1612test_expect_success 'R: abort on receiving feature after data command' '
1613        test_must_fail git fast-import <input
1614'
1615
1616cat >input << EOF
1617feature import-marks=git.marks
1618feature import-marks=git2.marks
1619EOF
1620
1621test_expect_success 'R: only one import-marks feature allowed per stream' '
1622        test_must_fail git fast-import <input
1623'
1624
1625cat >input << EOF
1626feature export-marks=git.marks
1627blob
1628mark :1
1629data 3
1630hi
1631
1632EOF
1633
1634test_expect_success \
1635    'R: export-marks feature results in a marks file being created' \
1636    'cat input | git fast-import &&
1637    grep :1 git.marks'
1638
1639test_expect_success \
1640    'R: export-marks options can be overriden by commandline options' \
1641    'cat input | git fast-import --export-marks=other.marks &&
1642    grep :1 other.marks'
1643
1644cat >input << EOF
1645feature import-marks=marks.out
1646feature export-marks=marks.new
1647EOF
1648
1649test_expect_success \
1650    'R: import to output marks works without any content' \
1651    'cat input | git fast-import &&
1652    test_cmp marks.out marks.new'
1653
1654cat >input <<EOF
1655feature import-marks=nonexistant.marks
1656feature export-marks=marks.new
1657EOF
1658
1659test_expect_success \
1660    'R: import marks prefers commandline marks file over the stream' \
1661    'cat input | git fast-import --import-marks=marks.out &&
1662    test_cmp marks.out marks.new'
1663
1664
1665cat >input <<EOF
1666feature import-marks=nonexistant.marks
1667feature export-marks=combined.marks
1668EOF
1669
1670test_expect_success 'R: multiple --import-marks= should be honoured' '
1671    head -n2 marks.out > one.marks &&
1672    tail -n +3 marks.out > two.marks &&
1673    git fast-import --import-marks=one.marks --import-marks=two.marks <input &&
1674    test_cmp marks.out combined.marks
1675'
1676
1677cat >input <<EOF
1678feature relative-marks
1679feature import-marks=relative.in
1680feature export-marks=relative.out
1681EOF
1682
1683test_expect_success 'R: feature relative-marks should be honoured' '
1684    mkdir -p .git/info/fast-import/ &&
1685    cp marks.new .git/info/fast-import/relative.in &&
1686    git fast-import <input &&
1687    test_cmp marks.new .git/info/fast-import/relative.out
1688'
1689
1690cat >input <<EOF
1691feature relative-marks
1692feature import-marks=relative.in
1693feature no-relative-marks
1694feature export-marks=non-relative.out
1695EOF
1696
1697test_expect_success 'R: feature no-relative-marks should be honoured' '
1698    git fast-import <input &&
1699    test_cmp marks.new non-relative.out
1700'
1701
1702cat >input << EOF
1703option git quiet
1704blob
1705data 3
1706hi
1707
1708EOF
1709
1710touch empty
1711
1712test_expect_success 'R: quiet option results in no stats being output' '
1713    cat input | git fast-import 2> output &&
1714    test_cmp empty output
1715'
1716
1717cat >input <<EOF
1718option git non-existing-option
1719EOF
1720
1721test_expect_success 'R: die on unknown option' '
1722    test_must_fail git fast-import <input
1723'
1724
1725test_expect_success 'R: unknown commandline options are rejected' '\
1726    test_must_fail git fast-import --non-existing-option < /dev/null
1727'
1728
1729cat >input <<EOF
1730option non-existing-vcs non-existing-option
1731EOF
1732
1733test_expect_success 'R: ignore non-git options' '
1734    git fast-import <input
1735'
1736
1737##
1738## R: very large blobs
1739##
1740blobsize=$((2*1024*1024 + 53))
1741test-genrandom bar $blobsize >expect
1742cat >input <<INPUT_END
1743commit refs/heads/big-file
1744committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1745data <<COMMIT
1746R - big file
1747COMMIT
1748
1749M 644 inline big1
1750data $blobsize
1751INPUT_END
1752cat expect >>input
1753cat >>input <<INPUT_END
1754M 644 inline big2
1755data $blobsize
1756INPUT_END
1757cat expect >>input
1758echo >>input
1759
1760test_expect_success \
1761        'R: blob bigger than threshold' \
1762        'test_create_repo R &&
1763         git --git-dir=R/.git fast-import --big-file-threshold=1 <input'
1764test_expect_success \
1765        'R: verify created pack' \
1766        ': >verify &&
1767         for p in R/.git/objects/pack/*.pack;
1768         do
1769           git verify-pack -v $p >>verify || exit;
1770         done'
1771test_expect_success \
1772        'R: verify written objects' \
1773        'git --git-dir=R/.git cat-file blob big-file:big1 >actual &&
1774         test_cmp expect actual &&
1775         a=$(git --git-dir=R/.git rev-parse big-file:big1) &&
1776         b=$(git --git-dir=R/.git rev-parse big-file:big2) &&
1777         test $a = $b'
1778test_expect_success \
1779        'R: blob appears only once' \
1780        'n=$(grep $a verify | wc -l) &&
1781         test 1 = $n'
1782
1783test_done