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