t/t9300-fast-import.sh

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