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