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