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 # Print $1 bytes from stdin to stdout.
  11 #
  12 # This could be written as "head -c $1", but IRIX "head" does not
  13 # support the -c option.
  14 head_c () {
  15         perl -e '
  16                 my $len = $ARGV[1];
  17                 while ($len > 0) {
  18                         my $s;
  19                         my $nread = sysread(STDIN, $s, $len);
  20                         die "cannot read: $!" unless defined($nread);
  21                         print $s;
  22                         $len -= $nread;
  23                 }
  24         ' - "$1"
  25 }
  26
  27 file2_data='file2
  28 second line of EOF'
  29
  30 file3_data='EOF
  31 in 3rd file
  32  END'
  33
  34 file4_data=abcd
  35 file4_len=4
  36
  37 file5_data='an inline file.
  38   we should see it later.'
  39
  40 file6_data='#!/bin/sh
  41 echo "$@"'
  42
  43 >empty
  44
  45 test_expect_success 'setup: have pipes?' '
  46         rm -f frob &&
  47         if mkfifo frob
  48         then
  49                 test_set_prereq PIPE
  50         fi
  51 '
  52
  53 ###
  54 ### series A
  55 ###
  56
  57 test_tick
  58
  59 test_expect_success 'empty stream succeeds' '
  60         git fast-import </dev/null
  61 '
  62
  63 cat >input <<INPUT_END
  64 blob
  65 mark :2
  66 data <<EOF
  67 $file2_data
  68 EOF
  69
  70 blob
  71 mark :3
  72 data <<END
  73 $file3_data
  74 END
  75
  76 blob
  77 mark :4
  78 data $file4_len
  79 $file4_data
  80 commit refs/heads/master
  81 mark :5
  82 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
  83 data <<COMMIT
  84 initial
  85 COMMIT
  86
  87 M 644 :2 file2
  88 M 644 :3 file3
  89 M 755 :4 file4
  90
  91 tag series-A
  92 from :5
  93 data <<EOF
  94 An annotated tag without a tagger
  95 EOF
  96
  97 INPUT_END
  98 test_expect_success \
  99     'A: create pack from stdin' \
 100     'git fast-import --export-marks=marks.out <input &&
 101          git whatchanged master'
 102 test_expect_success \
 103         'A: verify pack' \
 104         'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'
 105
 106 cat >expect <<EOF
 107 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 108 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 109
 110 initial
 111 EOF
 112 test_expect_success \
 113         'A: verify commit' \
 114         'git cat-file commit master | sed 1d >actual &&
 115         test_cmp expect actual'
 116
 117 cat >expect <<EOF
 118 100644 blob file2
 119 100644 blob file3
 120 100755 blob file4
 121 EOF
 122 test_expect_success \
 123         'A: verify tree' \
 124         'git cat-file -p master^{tree} | sed "s/ [0-9a-f]*      / /" >actual &&
 125          test_cmp expect actual'
 126
 127 echo "$file2_data" >expect
 128 test_expect_success \
 129         'A: verify file2' \
 130         'git cat-file blob master:file2 >actual && test_cmp expect actual'
 131
 132 echo "$file3_data" >expect
 133 test_expect_success \
 134         'A: verify file3' \
 135         'git cat-file blob master:file3 >actual && test_cmp expect actual'
 136
 137 printf "$file4_data" >expect
 138 test_expect_success \
 139         'A: verify file4' \
 140         'git cat-file blob master:file4 >actual && test_cmp expect actual'
 141
 142 cat >expect <<EOF
 143 object $(git rev-parse refs/heads/master)
 144 type commit
 145 tag series-A
 146
 147 An annotated tag without a tagger
 148 EOF
 149 test_expect_success 'A: verify tag/series-A' '
 150         git cat-file tag tags/series-A >actual &&
 151         test_cmp expect actual
 152 '
 153
 154 cat >expect <<EOF
 155 :2 `git rev-parse --verify master:file2`
 156 :3 `git rev-parse --verify master:file3`
 157 :4 `git rev-parse --verify master:file4`
 158 :5 `git rev-parse --verify master^0`
 159 EOF
 160 test_expect_success \
 161         'A: verify marks output' \
 162         'test_cmp expect marks.out'
 163
 164 test_expect_success \
 165         'A: verify marks import' \
 166         'git fast-import \
 167                 --import-marks=marks.out \
 168                 --export-marks=marks.new \
 169                 </dev/null &&
 170         test_cmp expect marks.new'
 171
 172 test_tick
 173 cat >input <<INPUT_END
 174 commit refs/heads/verify--import-marks
 175 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 176 data <<COMMIT
 177 recreate from :5
 178 COMMIT
 179
 180 from :5
 181 M 755 :2 copy-of-file2
 182
 183 INPUT_END
 184 test_expect_success \
 185         'A: verify marks import does not crash' \
 186         'git fast-import --import-marks=marks.out <input &&
 187          git whatchanged verify--import-marks'
 188 test_expect_success \
 189         'A: verify pack' \
 190         'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'
 191 cat >expect <<EOF
 192 :000000 100755 0000000000000000000000000000000000000000 7123f7f44e39be127c5eb701e5968176ee9d78b1 A      copy-of-file2
 193 EOF
 194 git diff-tree -M -r master verify--import-marks >actual
 195 test_expect_success \
 196         'A: verify diff' \
 197         'compare_diff_raw expect actual &&
 198          test `git rev-parse --verify master:file2` \
 199             = `git rev-parse --verify verify--import-marks:copy-of-file2`'
 200
 201 test_tick
 202 mt=$(git hash-object --stdin < /dev/null)
 203 : >input.blob
 204 : >marks.exp
 205 : >tree.exp
 206
 207 cat >input.commit <<EOF
 208 commit refs/heads/verify--dump-marks
 209 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 210 data <<COMMIT
 211 test the sparse array dumping routines with exponentially growing marks
 212 COMMIT
 213 EOF
 214
 215 i=0
 216 l=4
 217 m=6
 218 n=7
 219 while test "$i" -lt 27; do
 220     cat >>input.blob <<EOF
 221 blob
 222 mark :$l
 223 data 0
 224 blob
 225 mark :$m
 226 data 0
 227 blob
 228 mark :$n
 229 data 0
 230 EOF
 231     echo "M 100644 :$l l$i" >>input.commit
 232     echo "M 100644 :$m m$i" >>input.commit
 233     echo "M 100644 :$n n$i" >>input.commit
 234
 235     echo ":$l $mt" >>marks.exp
 236     echo ":$m $mt" >>marks.exp
 237     echo ":$n $mt" >>marks.exp
 238
 239     printf "100644 blob $mt\tl$i\n" >>tree.exp
 240     printf "100644 blob $mt\tm$i\n" >>tree.exp
 241     printf "100644 blob $mt\tn$i\n" >>tree.exp
 242
 243     l=$(($l + $l))
 244     m=$(($m + $m))
 245     n=$(($l + $n))
 246
 247     i=$((1 + $i))
 248 done
 249
 250 sort tree.exp > tree.exp_s
 251
 252 test_expect_success 'A: export marks with large values' '
 253         cat input.blob input.commit | git fast-import --export-marks=marks.large &&
 254         git ls-tree refs/heads/verify--dump-marks >tree.out &&
 255         test_cmp tree.exp_s tree.out &&
 256         test_cmp marks.exp marks.large'
 257
 258 ###
 259 ### series B
 260 ###
 261
 262 test_tick
 263 cat >input <<INPUT_END
 264 commit refs/heads/branch
 265 mark :1
 266 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 267 data <<COMMIT
 268 corrupt
 269 COMMIT
 270
 271 from refs/heads/master
 272 M 755 0000000000000000000000000000000000000001 zero1
 273
 274 INPUT_END
 275 test_expect_success 'B: fail on invalid blob sha1' '
 276     test_must_fail git fast-import <input
 277 '
 278 rm -f .git/objects/pack_* .git/objects/index_*
 279
 280 cat >input <<INPUT_END
 281 commit .badbranchname
 282 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 283 data <<COMMIT
 284 corrupt
 285 COMMIT
 286
 287 from refs/heads/master
 288
 289 INPUT_END
 290 test_expect_success 'B: fail on invalid branch name ".badbranchname"' '
 291     test_must_fail git fast-import <input
 292 '
 293 rm -f .git/objects/pack_* .git/objects/index_*
 294
 295 cat >input <<INPUT_END
 296 commit bad[branch]name
 297 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 298 data <<COMMIT
 299 corrupt
 300 COMMIT
 301
 302 from refs/heads/master
 303
 304 INPUT_END
 305 test_expect_success 'B: fail on invalid branch name "bad[branch]name"' '
 306     test_must_fail git fast-import <input
 307 '
 308 rm -f .git/objects/pack_* .git/objects/index_*
 309
 310 cat >input <<INPUT_END
 311 commit TEMP_TAG
 312 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 313 data <<COMMIT
 314 tag base
 315 COMMIT
 316
 317 from refs/heads/master
 318
 319 INPUT_END
 320 test_expect_success \
 321     'B: accept branch name "TEMP_TAG"' \
 322     'git fast-import <input &&
 323          test -f .git/TEMP_TAG &&
 324          test `git rev-parse master` = `git rev-parse TEMP_TAG^`'
 325 rm -f .git/TEMP_TAG
 326
 327 ###
 328 ### series C
 329 ###
 330
 331 newf=`echo hi newf | git hash-object -w --stdin`
 332 oldf=`git rev-parse --verify master:file2`
 333 test_tick
 334 cat >input <<INPUT_END
 335 commit refs/heads/branch
 336 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 337 data <<COMMIT
 338 second
 339 COMMIT
 340
 341 from refs/heads/master
 342 M 644 $oldf file2/oldf
 343 M 755 $newf file2/newf
 344 D file3
 345
 346 INPUT_END
 347 test_expect_success \
 348     'C: incremental import create pack from stdin' \
 349     'git fast-import <input &&
 350          git whatchanged branch'
 351 test_expect_success \
 352         'C: verify pack' \
 353         'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'
 354 test_expect_success \
 355         'C: validate reuse existing blob' \
 356         'test $newf = `git rev-parse --verify branch:file2/newf` &&
 357          test $oldf = `git rev-parse --verify branch:file2/oldf`'
 358
 359 cat >expect <<EOF
 360 parent `git rev-parse --verify master^0`
 361 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 362 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 363
 364 second
 365 EOF
 366 test_expect_success \
 367         'C: verify commit' \
 368         'git cat-file commit branch | sed 1d >actual &&
 369          test_cmp expect actual'
 370
 371 cat >expect <<EOF
 372 :000000 100755 0000000000000000000000000000000000000000 f1fb5da718392694d0076d677d6d0e364c79b0bc A      file2/newf
 373 :100644 100644 7123f7f44e39be127c5eb701e5968176ee9d78b1 7123f7f44e39be127c5eb701e5968176ee9d78b1 R100   file2   file2/oldf
 374 :100644 000000 0d92e9f3374ae2947c23aa477cbc68ce598135f1 0000000000000000000000000000000000000000 D      file3
 375 EOF
 376 git diff-tree -M -r master branch >actual
 377 test_expect_success \
 378         'C: validate rename result' \
 379         'compare_diff_raw expect actual'
 380
 381 ###
 382 ### series D
 383 ###
 384
 385 test_tick
 386 cat >input <<INPUT_END
 387 commit refs/heads/branch
 388 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 389 data <<COMMIT
 390 third
 391 COMMIT
 392
 393 from refs/heads/branch^0
 394 M 644 inline newdir/interesting
 395 data <<EOF
 396 $file5_data
 397 EOF
 398
 399 M 755 inline newdir/exec.sh
 400 data <<EOF
 401 $file6_data
 402 EOF
 403
 404 INPUT_END
 405 test_expect_success \
 406     'D: inline data in commit' \
 407     'git fast-import <input &&
 408          git whatchanged branch'
 409 test_expect_success \
 410         'D: verify pack' \
 411         'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'
 412
 413 cat >expect <<EOF
 414 :000000 100755 0000000000000000000000000000000000000000 35a59026a33beac1569b1c7f66f3090ce9c09afc A      newdir/exec.sh
 415 :000000 100644 0000000000000000000000000000000000000000 046d0371e9220107917db0d0e030628de8a1de9b A      newdir/interesting
 416 EOF
 417 git diff-tree -M -r branch^ branch >actual
 418 test_expect_success \
 419         'D: validate new files added' \
 420         'compare_diff_raw expect actual'
 421
 422 echo "$file5_data" >expect
 423 test_expect_success \
 424         'D: verify file5' \
 425         'git cat-file blob branch:newdir/interesting >actual &&
 426          test_cmp expect actual'
 427
 428 echo "$file6_data" >expect
 429 test_expect_success \
 430         'D: verify file6' \
 431         'git cat-file blob branch:newdir/exec.sh >actual &&
 432          test_cmp expect actual'
 433
 434 ###
 435 ### series E
 436 ###
 437
 438 cat >input <<INPUT_END
 439 commit refs/heads/branch
 440 author $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> Tue Feb 6 11:22:18 2007 -0500
 441 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> Tue Feb 6 12:35:02 2007 -0500
 442 data <<COMMIT
 443 RFC 2822 type date
 444 COMMIT
 445
 446 from refs/heads/branch^0
 447
 448 INPUT_END
 449 test_expect_success 'E: rfc2822 date, --date-format=raw' '
 450     test_must_fail git fast-import --date-format=raw <input
 451 '
 452 test_expect_success \
 453     'E: rfc2822 date, --date-format=rfc2822' \
 454     'git fast-import --date-format=rfc2822 <input'
 455 test_expect_success \
 456         'E: verify pack' \
 457         'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'
 458
 459 cat >expect <<EOF
 460 author $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> 1170778938 -0500
 461 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1170783302 -0500
 462
 463 RFC 2822 type date
 464 EOF
 465 test_expect_success \
 466         'E: verify commit' \
 467         'git cat-file commit branch | sed 1,2d >actual &&
 468         test_cmp expect actual'
 469
 470 ###
 471 ### series F
 472 ###
 473
 474 old_branch=`git rev-parse --verify branch^0`
 475 test_tick
 476 cat >input <<INPUT_END
 477 commit refs/heads/branch
 478 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 479 data <<COMMIT
 480 losing things already?
 481 COMMIT
 482
 483 from refs/heads/branch~1
 484
 485 reset refs/heads/other
 486 from refs/heads/branch
 487
 488 INPUT_END
 489 test_expect_success \
 490     'F: non-fast-forward update skips' \
 491     'if git fast-import <input
 492          then
 493                 echo BAD gfi did not fail
 494                 return 1
 495          else
 496                 if test $old_branch = `git rev-parse --verify branch^0`
 497                 then
 498                         : branch unaffected and failure returned
 499                         return 0
 500                 else
 501                         echo BAD gfi changed branch $old_branch
 502                         return 1
 503                 fi
 504          fi
 505         '
 506 test_expect_success \
 507         'F: verify pack' \
 508         'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'
 509
 510 cat >expect <<EOF
 511 tree `git rev-parse branch~1^{tree}`
 512 parent `git rev-parse branch~1`
 513 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 514 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 515
 516 losing things already?
 517 EOF
 518 test_expect_success \
 519         'F: verify other commit' \
 520         'git cat-file commit other >actual &&
 521         test_cmp expect actual'
 522
 523 ###
 524 ### series G
 525 ###
 526
 527 old_branch=`git rev-parse --verify branch^0`
 528 test_tick
 529 cat >input <<INPUT_END
 530 commit refs/heads/branch
 531 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 532 data <<COMMIT
 533 losing things already?
 534 COMMIT
 535
 536 from refs/heads/branch~1
 537
 538 INPUT_END
 539 test_expect_success \
 540     'G: non-fast-forward update forced' \
 541     'git fast-import --force <input'
 542 test_expect_success \
 543         'G: verify pack' \
 544         'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'
 545 test_expect_success \
 546         'G: branch changed, but logged' \
 547         'test $old_branch != `git rev-parse --verify branch^0` &&
 548          test $old_branch = `git rev-parse --verify branch@{1}`'
 549
 550 ###
 551 ### series H
 552 ###
 553
 554 test_tick
 555 cat >input <<INPUT_END
 556 commit refs/heads/H
 557 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 558 data <<COMMIT
 559 third
 560 COMMIT
 561
 562 from refs/heads/branch^0
 563 M 644 inline i-will-die
 564 data <<EOF
 565 this file will never exist.
 566 EOF
 567
 568 deleteall
 569 M 644 inline h/e/l/lo
 570 data <<EOF
 571 $file5_data
 572 EOF
 573
 574 INPUT_END
 575 test_expect_success \
 576     'H: deletall, add 1' \
 577     'git fast-import <input &&
 578          git whatchanged H'
 579 test_expect_success \
 580         'H: verify pack' \
 581         'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'
 582
 583 cat >expect <<EOF
 584 :100755 000000 f1fb5da718392694d0076d677d6d0e364c79b0bc 0000000000000000000000000000000000000000 D      file2/newf
 585 :100644 000000 7123f7f44e39be127c5eb701e5968176ee9d78b1 0000000000000000000000000000000000000000 D      file2/oldf
 586 :100755 000000 85df50785d62d3b05ab03d9cbf7e4a0b49449730 0000000000000000000000000000000000000000 D      file4
 587 :100644 100644 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 R100   newdir/interesting      h/e/l/lo
 588 :100755 000000 e74b7d465e52746be2b4bae983670711e6e66657 0000000000000000000000000000000000000000 D      newdir/exec.sh
 589 EOF
 590 git diff-tree -M -r H^ H >actual
 591 test_expect_success \
 592         'H: validate old files removed, new files added' \
 593         'compare_diff_raw expect actual'
 594
 595 echo "$file5_data" >expect
 596 test_expect_success \
 597         'H: verify file' \
 598         'git cat-file blob H:h/e/l/lo >actual &&
 599          test_cmp expect actual'
 600
 601 ###
 602 ### series I
 603 ###
 604
 605 cat >input <<INPUT_END
 606 commit refs/heads/export-boundary
 607 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 608 data <<COMMIT
 609 we have a border.  its only 40 characters wide.
 610 COMMIT
 611
 612 from refs/heads/branch
 613
 614 INPUT_END
 615 test_expect_success \
 616     'I: export-pack-edges' \
 617     'git fast-import --export-pack-edges=edges.list <input'
 618
 619 cat >expect <<EOF
 620 .git/objects/pack/pack-.pack: `git rev-parse --verify export-boundary`
 621 EOF
 622 test_expect_success \
 623         'I: verify edge list' \
 624         'sed -e s/pack-.*pack/pack-.pack/ edges.list >actual &&
 625          test_cmp expect actual'
 626
 627 ###
 628 ### series J
 629 ###
 630
 631 cat >input <<INPUT_END
 632 commit refs/heads/J
 633 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 634 data <<COMMIT
 635 create J
 636 COMMIT
 637
 638 from refs/heads/branch
 639
 640 reset refs/heads/J
 641
 642 commit refs/heads/J
 643 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 644 data <<COMMIT
 645 initialize J
 646 COMMIT
 647
 648 INPUT_END
 649 test_expect_success \
 650     'J: reset existing branch creates empty commit' \
 651     'git fast-import <input'
 652 test_expect_success \
 653         'J: branch has 1 commit, empty tree' \
 654         'test 1 = `git rev-list J | wc -l` &&
 655          test 0 = `git ls-tree J | wc -l`'
 656
 657 ###
 658 ### series K
 659 ###
 660
 661 cat >input <<INPUT_END
 662 commit refs/heads/K
 663 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 664 data <<COMMIT
 665 create K
 666 COMMIT
 667
 668 from refs/heads/branch
 669
 670 commit refs/heads/K
 671 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 672 data <<COMMIT
 673 redo K
 674 COMMIT
 675
 676 from refs/heads/branch^1
 677
 678 INPUT_END
 679 test_expect_success \
 680     'K: reinit branch with from' \
 681     'git fast-import <input'
 682 test_expect_success \
 683     'K: verify K^1 = branch^1' \
 684     'test `git rev-parse --verify branch^1` \
 685                 = `git rev-parse --verify K^1`'
 686
 687 ###
 688 ### series L
 689 ###
 690
 691 cat >input <<INPUT_END
 692 blob
 693 mark :1
 694 data <<EOF
 695 some data
 696 EOF
 697
 698 blob
 699 mark :2
 700 data <<EOF
 701 other data
 702 EOF
 703
 704 commit refs/heads/L
 705 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 706 data <<COMMIT
 707 create L
 708 COMMIT
 709
 710 M 644 :1 b.
 711 M 644 :1 b/other
 712 M 644 :1 ba
 713
 714 commit refs/heads/L
 715 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 716 data <<COMMIT
 717 update L
 718 COMMIT
 719
 720 M 644 :2 b.
 721 M 644 :2 b/other
 722 M 644 :2 ba
 723 INPUT_END
 724
 725 cat >expect <<EXPECT_END
 726 :100644 100644 4268632... 55d3a52... M  b.
 727 :040000 040000 0ae5cac... 443c768... M  b
 728 :100644 100644 4268632... 55d3a52... M  ba
 729 EXPECT_END
 730
 731 test_expect_success \
 732     'L: verify internal tree sorting' \
 733         'git fast-import <input &&
 734          git diff-tree --abbrev --raw L^ L >output &&
 735          test_cmp expect output'
 736
 737 ###
 738 ### series M
 739 ###
 740
 741 test_tick
 742 cat >input <<INPUT_END
 743 commit refs/heads/M1
 744 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 745 data <<COMMIT
 746 file rename
 747 COMMIT
 748
 749 from refs/heads/branch^0
 750 R file2/newf file2/n.e.w.f
 751
 752 INPUT_END
 753
 754 cat >expect <<EOF
 755 :100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc R100   file2/newf      file2/n.e.w.f
 756 EOF
 757 test_expect_success \
 758         'M: rename file in same subdirectory' \
 759         'git fast-import <input &&
 760          git diff-tree -M -r M1^ M1 >actual &&
 761          compare_diff_raw expect actual'
 762
 763 cat >input <<INPUT_END
 764 commit refs/heads/M2
 765 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 766 data <<COMMIT
 767 file rename
 768 COMMIT
 769
 770 from refs/heads/branch^0
 771 R file2/newf i/am/new/to/you
 772
 773 INPUT_END
 774
 775 cat >expect <<EOF
 776 :100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc R100   file2/newf      i/am/new/to/you
 777 EOF
 778 test_expect_success \
 779         'M: rename file to new subdirectory' \
 780         'git fast-import <input &&
 781          git diff-tree -M -r M2^ M2 >actual &&
 782          compare_diff_raw expect actual'
 783
 784 cat >input <<INPUT_END
 785 commit refs/heads/M3
 786 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 787 data <<COMMIT
 788 file rename
 789 COMMIT
 790
 791 from refs/heads/M2^0
 792 R i other/sub
 793
 794 INPUT_END
 795
 796 cat >expect <<EOF
 797 :100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc R100   i/am/new/to/you other/sub/am/new/to/you
 798 EOF
 799 test_expect_success \
 800         'M: rename subdirectory to new subdirectory' \
 801         'git fast-import <input &&
 802          git diff-tree -M -r M3^ M3 >actual &&
 803          compare_diff_raw expect actual'
 804
 805 ###
 806 ### series N
 807 ###
 808
 809 test_tick
 810 cat >input <<INPUT_END
 811 commit refs/heads/N1
 812 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 813 data <<COMMIT
 814 file copy
 815 COMMIT
 816
 817 from refs/heads/branch^0
 818 C file2/newf file2/n.e.w.f
 819
 820 INPUT_END
 821
 822 cat >expect <<EOF
 823 :100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc C100   file2/newf      file2/n.e.w.f
 824 EOF
 825 test_expect_success \
 826         'N: copy file in same subdirectory' \
 827         'git fast-import <input &&
 828          git diff-tree -C --find-copies-harder -r N1^ N1 >actual &&
 829          compare_diff_raw expect actual'
 830
 831 cat >input <<INPUT_END
 832 commit refs/heads/N2
 833 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 834 data <<COMMIT
 835 clean directory copy
 836 COMMIT
 837
 838 from refs/heads/branch^0
 839 C file2 file3
 840
 841 commit refs/heads/N2
 842 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 843 data <<COMMIT
 844 modify directory copy
 845 COMMIT
 846
 847 M 644 inline file3/file5
 848 data <<EOF
 849 $file5_data
 850 EOF
 851
 852 INPUT_END
 853
 854 cat >expect <<EOF
 855 :100644 100644 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 C100   newdir/interesting      file3/file5
 856 :100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc C100   file2/newf      file3/newf
 857 :100644 100644 7123f7f44e39be127c5eb701e5968176ee9d78b1 7123f7f44e39be127c5eb701e5968176ee9d78b1 C100   file2/oldf      file3/oldf
 858 EOF
 859 test_expect_success \
 860         'N: copy then modify subdirectory' \
 861         'git fast-import <input &&
 862          git diff-tree -C --find-copies-harder -r N2^^ N2 >actual &&
 863          compare_diff_raw expect actual'
 864
 865 cat >input <<INPUT_END
 866 commit refs/heads/N3
 867 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 868 data <<COMMIT
 869 dirty directory copy
 870 COMMIT
 871
 872 from refs/heads/branch^0
 873 M 644 inline file2/file5
 874 data <<EOF
 875 $file5_data
 876 EOF
 877
 878 C file2 file3
 879 D file2/file5
 880
 881 INPUT_END
 882
 883 test_expect_success \
 884         'N: copy dirty subdirectory' \
 885         'git fast-import <input &&
 886          test `git rev-parse N2^{tree}` = `git rev-parse N3^{tree}`'
 887
 888 test_expect_success \
 889         'N: copy directory by id' \
 890         'cat >expect <<-\EOF &&
 891         :100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc C100   file2/newf      file3/newf
 892         :100644 100644 7123f7f44e39be127c5eb701e5968176ee9d78b1 7123f7f44e39be127c5eb701e5968176ee9d78b1 C100   file2/oldf      file3/oldf
 893         EOF
 894          subdir=$(git rev-parse refs/heads/branch^0:file2) &&
 895          cat >input <<-INPUT_END &&
 896         commit refs/heads/N4
 897         committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 898         data <<COMMIT
 899         copy by tree hash
 900         COMMIT
 901
 902         from refs/heads/branch^0
 903         M 040000 $subdir file3
 904         INPUT_END
 905          git fast-import <input &&
 906          git diff-tree -C --find-copies-harder -r N4^ N4 >actual &&
 907          compare_diff_raw expect actual'
 908
 909 test_expect_success PIPE 'N: read and copy directory' '
 910         cat >expect <<-\EOF
 911         :100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc C100   file2/newf      file3/newf
 912         :100644 100644 7123f7f44e39be127c5eb701e5968176ee9d78b1 7123f7f44e39be127c5eb701e5968176ee9d78b1 C100   file2/oldf      file3/oldf
 913         EOF
 914         git update-ref -d refs/heads/N4 &&
 915         rm -f backflow &&
 916         mkfifo backflow &&
 917         (
 918                 exec <backflow &&
 919                 cat <<-EOF &&
 920                 commit refs/heads/N4
 921                 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 922                 data <<COMMIT
 923                 copy by tree hash, part 2
 924                 COMMIT
 925
 926                 from refs/heads/branch^0
 927                 ls "file2"
 928                 EOF
 929                 read mode type tree filename &&
 930                 echo "M 040000 $tree file3"
 931         ) |
 932         git fast-import --cat-blob-fd=3 3>backflow &&
 933         git diff-tree -C --find-copies-harder -r N4^ N4 >actual &&
 934         compare_diff_raw expect actual
 935 '
 936
 937 test_expect_success PIPE 'N: empty directory reads as missing' '
 938         cat <<-\EOF >expect &&
 939         OBJNAME
 940         :000000 100644 OBJNAME OBJNAME A        unrelated
 941         EOF
 942         echo "missing src" >expect.response &&
 943         git update-ref -d refs/heads/read-empty &&
 944         rm -f backflow &&
 945         mkfifo backflow &&
 946         (
 947                 exec <backflow &&
 948                 cat <<-EOF &&
 949                 commit refs/heads/read-empty
 950                 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 951                 data <<COMMIT
 952                 read "empty" (missing) directory
 953                 COMMIT
 954
 955                 M 100644 inline src/greeting
 956                 data <<BLOB
 957                 hello
 958                 BLOB
 959                 C src/greeting dst1/non-greeting
 960                 C src/greeting unrelated
 961                 # leave behind "empty" src directory
 962                 D src/greeting
 963                 ls "src"
 964                 EOF
 965                 read -r line &&
 966                 printf "%s\n" "$line" >response &&
 967                 cat <<-\EOF
 968                 D dst1
 969                 D dst2
 970                 EOF
 971         ) |
 972         git fast-import --cat-blob-fd=3 3>backflow &&
 973         test_cmp expect.response response &&
 974         git rev-list read-empty |
 975         git diff-tree -r --root --stdin |
 976         sed "s/$_x40/OBJNAME/g" >actual &&
 977         test_cmp expect actual
 978 '
 979
 980 test_expect_success \
 981         'N: copy root directory by tree hash' \
 982         'cat >expect <<-\EOF &&
 983         :100755 000000 f1fb5da718392694d0076d677d6d0e364c79b0bc 0000000000000000000000000000000000000000 D      file3/newf
 984         :100644 000000 7123f7f44e39be127c5eb701e5968176ee9d78b1 0000000000000000000000000000000000000000 D      file3/oldf
 985         EOF
 986          root=$(git rev-parse refs/heads/branch^0^{tree}) &&
 987          cat >input <<-INPUT_END &&
 988         commit refs/heads/N6
 989         committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 990         data <<COMMIT
 991         copy root directory by tree hash
 992         COMMIT
 993
 994         from refs/heads/branch^0
 995         M 040000 $root ""
 996         INPUT_END
 997          git fast-import <input &&
 998          git diff-tree -C --find-copies-harder -r N4 N6 >actual &&
 999          compare_diff_raw expect actual'
1000
1001 test_expect_success \
1002         'N: delete directory by copying' \
1003         'cat >expect <<-\EOF &&
1004         OBJID
1005         :100644 000000 OBJID OBJID D    foo/bar/qux
1006         OBJID
1007         :000000 100644 OBJID OBJID A    foo/bar/baz
1008         :000000 100644 OBJID OBJID A    foo/bar/qux
1009         EOF
1010          empty_tree=$(git mktree </dev/null) &&
1011          cat >input <<-INPUT_END &&
1012         commit refs/heads/N-delete
1013         committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1014         data <<COMMIT
1015         collect data to be deleted
1016         COMMIT
1017
1018         deleteall
1019         M 100644 inline foo/bar/baz
1020         data <<DATA_END
1021         hello
1022         DATA_END
1023         C "foo/bar/baz" "foo/bar/qux"
1024         C "foo/bar/baz" "foo/bar/quux/1"
1025         C "foo/bar/baz" "foo/bar/quuux"
1026         M 040000 $empty_tree foo/bar/quux
1027         M 040000 $empty_tree foo/bar/quuux
1028
1029         commit refs/heads/N-delete
1030         committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1031         data <<COMMIT
1032         delete subdirectory
1033         COMMIT
1034
1035         M 040000 $empty_tree foo/bar/qux
1036         INPUT_END
1037          git fast-import <input &&
1038          git rev-list N-delete |
1039                 git diff-tree -r --stdin --root --always |
1040                 sed -e "s/$_x40/OBJID/g" >actual &&
1041          test_cmp expect actual'
1042
1043 test_expect_success \
1044         'N: modify copied tree' \
1045         'cat >expect <<-\EOF &&
1046         :100644 100644 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 C100   newdir/interesting      file3/file5
1047         :100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc C100   file2/newf      file3/newf
1048         :100644 100644 7123f7f44e39be127c5eb701e5968176ee9d78b1 7123f7f44e39be127c5eb701e5968176ee9d78b1 C100   file2/oldf      file3/oldf
1049         EOF
1050          subdir=$(git rev-parse refs/heads/branch^0:file2) &&
1051          cat >input <<-INPUT_END &&
1052         commit refs/heads/N5
1053         committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1054         data <<COMMIT
1055         copy by tree hash
1056         COMMIT
1057
1058         from refs/heads/branch^0
1059         M 040000 $subdir file3
1060
1061         commit refs/heads/N5
1062         committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1063         data <<COMMIT
1064         modify directory copy
1065         COMMIT
1066
1067         M 644 inline file3/file5
1068         data <<EOF
1069         $file5_data
1070         EOF
1071         INPUT_END
1072          git fast-import <input &&
1073          git diff-tree -C --find-copies-harder -r N5^^ N5 >actual &&
1074          compare_diff_raw expect actual'
1075
1076 test_expect_success \
1077         'N: reject foo/ syntax' \
1078         'subdir=$(git rev-parse refs/heads/branch^0:file2) &&
1079          test_must_fail git fast-import <<-INPUT_END
1080         commit refs/heads/N5B
1081         committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1082         data <<COMMIT
1083         copy with invalid syntax
1084         COMMIT
1085
1086         from refs/heads/branch^0
1087         M 040000 $subdir file3/
1088         INPUT_END'
1089
1090 test_expect_success \
1091         'N: reject foo/ syntax in copy source' \
1092         'test_must_fail git fast-import <<-INPUT_END
1093         commit refs/heads/N5C
1094         committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1095         data <<COMMIT
1096         copy with invalid syntax
1097         COMMIT
1098
1099         from refs/heads/branch^0
1100         C file2/ file3
1101         INPUT_END'
1102
1103 test_expect_success \
1104         'N: reject foo/ syntax in rename source' \
1105         'test_must_fail git fast-import <<-INPUT_END
1106         commit refs/heads/N5D
1107         committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1108         data <<COMMIT
1109         rename with invalid syntax
1110         COMMIT
1111
1112         from refs/heads/branch^0
1113         R file2/ file3
1114         INPUT_END'
1115
1116 test_expect_success \
1117         'N: reject foo/ syntax in ls argument' \
1118         'test_must_fail git fast-import <<-INPUT_END
1119         commit refs/heads/N5E
1120         committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1121         data <<COMMIT
1122         copy with invalid syntax
1123         COMMIT
1124
1125         from refs/heads/branch^0
1126         ls "file2/"
1127         INPUT_END'
1128
1129 test_expect_success \
1130         'N: copy to root by id and modify' \
1131         'echo "hello, world" >expect.foo &&
1132          echo hello >expect.bar &&
1133          git fast-import <<-SETUP_END &&
1134         commit refs/heads/N7
1135         committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1136         data <<COMMIT
1137         hello, tree
1138         COMMIT
1139
1140         deleteall
1141         M 644 inline foo/bar
1142         data <<EOF
1143         hello
1144         EOF
1145         SETUP_END
1146
1147          tree=$(git rev-parse --verify N7:) &&
1148          git fast-import <<-INPUT_END &&
1149         commit refs/heads/N8
1150         committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1151         data <<COMMIT
1152         copy to root by id and modify
1153         COMMIT
1154
1155         M 040000 $tree ""
1156         M 644 inline foo/foo
1157         data <<EOF
1158         hello, world
1159         EOF
1160         INPUT_END
1161          git show N8:foo/foo >actual.foo &&
1162          git show N8:foo/bar >actual.bar &&
1163          test_cmp expect.foo actual.foo &&
1164          test_cmp expect.bar actual.bar'
1165
1166 test_expect_success \
1167         'N: extract subtree' \
1168         'branch=$(git rev-parse --verify refs/heads/branch^{tree}) &&
1169          cat >input <<-INPUT_END &&
1170         commit refs/heads/N9
1171         committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1172         data <<COMMIT
1173         extract subtree branch:newdir
1174         COMMIT
1175
1176         M 040000 $branch ""
1177         C "newdir" ""
1178         INPUT_END
1179          git fast-import <input &&
1180          git diff --exit-code branch:newdir N9'
1181
1182 test_expect_success \
1183         'N: modify subtree, extract it, and modify again' \
1184         'echo hello >expect.baz &&
1185          echo hello, world >expect.qux &&
1186          git fast-import <<-SETUP_END &&
1187         commit refs/heads/N10
1188         committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1189         data <<COMMIT
1190         hello, tree
1191         COMMIT
1192
1193         deleteall
1194         M 644 inline foo/bar/baz
1195         data <<EOF
1196         hello
1197         EOF
1198         SETUP_END
1199
1200          tree=$(git rev-parse --verify N10:) &&
1201          git fast-import <<-INPUT_END &&
1202         commit refs/heads/N11
1203         committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1204         data <<COMMIT
1205         copy to root by id and modify
1206         COMMIT
1207
1208         M 040000 $tree ""
1209         M 100644 inline foo/bar/qux
1210         data <<EOF
1211         hello, world
1212         EOF
1213         R "foo" ""
1214         C "bar/qux" "bar/quux"
1215         INPUT_END
1216          git show N11:bar/baz >actual.baz &&
1217          git show N11:bar/qux >actual.qux &&
1218          git show N11:bar/quux >actual.quux &&
1219          test_cmp expect.baz actual.baz &&
1220          test_cmp expect.qux actual.qux &&
1221          test_cmp expect.qux actual.quux'
1222
1223 ###
1224 ### series O
1225 ###
1226
1227 cat >input <<INPUT_END
1228 #we will
1229 commit refs/heads/O1
1230 # -- ignore all of this text
1231 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1232 # $GIT_COMMITTER_NAME has inserted here for his benefit.
1233 data <<COMMIT
1234 dirty directory copy
1235 COMMIT
1236
1237 # don't forget the import blank line!
1238 #
1239 # yes, we started from our usual base of branch^0.
1240 # i like branch^0.
1241 from refs/heads/branch^0
1242 # and we need to reuse file2/file5 from N3 above.
1243 M 644 inline file2/file5
1244 # otherwise the tree will be different
1245 data <<EOF
1246 $file5_data
1247 EOF
1248
1249 # don't forget to copy file2 to file3
1250 C file2 file3
1251 #
1252 # or to delete file5 from file2.
1253 D file2/file5
1254 # are we done yet?
1255
1256 INPUT_END
1257
1258 test_expect_success \
1259         'O: comments are all skipped' \
1260         'git fast-import <input &&
1261          test `git rev-parse N3` = `git rev-parse O1`'
1262
1263 cat >input <<INPUT_END
1264 commit refs/heads/O2
1265 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1266 data <<COMMIT
1267 dirty directory copy
1268 COMMIT
1269 from refs/heads/branch^0
1270 M 644 inline file2/file5
1271 data <<EOF
1272 $file5_data
1273 EOF
1274 C file2 file3
1275 D file2/file5
1276
1277 INPUT_END
1278
1279 test_expect_success \
1280         'O: blank lines not necessary after data commands' \
1281         'git fast-import <input &&
1282          test `git rev-parse N3` = `git rev-parse O2`'
1283
1284 test_expect_success \
1285         'O: repack before next test' \
1286         'git repack -a -d'
1287
1288 cat >input <<INPUT_END
1289 commit refs/heads/O3
1290 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1291 data <<COMMIT
1292 zstring
1293 COMMIT
1294 commit refs/heads/O3
1295 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1296 data <<COMMIT
1297 zof
1298 COMMIT
1299 checkpoint
1300 commit refs/heads/O3
1301 mark :5
1302 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1303 data <<COMMIT
1304 zempty
1305 COMMIT
1306 checkpoint
1307 commit refs/heads/O3
1308 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1309 data <<COMMIT
1310 zcommits
1311 COMMIT
1312 reset refs/tags/O3-2nd
1313 from :5
1314 reset refs/tags/O3-3rd
1315 from :5
1316 INPUT_END
1317
1318 cat >expect <<INPUT_END
1319 string
1320 of
1321 empty
1322 commits
1323 INPUT_END
1324 test_expect_success \
1325         'O: blank lines not necessary after other commands' \
1326         'git fast-import <input &&
1327          test 8 = `find .git/objects/pack -type f | wc -l` &&
1328          test `git rev-parse refs/tags/O3-2nd` = `git rev-parse O3^` &&
1329          git log --reverse --pretty=oneline O3 | sed s/^.*z// >actual &&
1330          test_cmp expect actual'
1331
1332 cat >input <<INPUT_END
1333 commit refs/heads/O4
1334 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1335 data <<COMMIT
1336 zstring
1337 COMMIT
1338 commit refs/heads/O4
1339 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1340 data <<COMMIT
1341 zof
1342 COMMIT
1343 progress Two commits down, 2 to go!
1344 commit refs/heads/O4
1345 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1346 data <<COMMIT
1347 zempty
1348 COMMIT
1349 progress Three commits down, 1 to go!
1350 commit refs/heads/O4
1351 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1352 data <<COMMIT
1353 zcommits
1354 COMMIT
1355 progress I'm done!
1356 INPUT_END
1357 test_expect_success \
1358         'O: progress outputs as requested by input' \
1359         'git fast-import <input >actual &&
1360          grep "progress " <input >expect &&
1361          test_cmp expect actual'
1362
1363 ###
1364 ### series P (gitlinks)
1365 ###
1366
1367 cat >input <<INPUT_END
1368 blob
1369 mark :1
1370 data 10
1371 test file
1372
1373 reset refs/heads/sub
1374 commit refs/heads/sub
1375 mark :2
1376 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1377 data 12
1378 sub_initial
1379 M 100644 :1 file
1380
1381 blob
1382 mark :3
1383 data <<DATAEND
1384 [submodule "sub"]
1385         path = sub
1386         url = "`pwd`/sub"
1387 DATAEND
1388
1389 commit refs/heads/subuse1
1390 mark :4
1391 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1392 data 8
1393 initial
1394 from refs/heads/master
1395 M 100644 :3 .gitmodules
1396 M 160000 :2 sub
1397
1398 blob
1399 mark :5
1400 data 20
1401 test file
1402 more data
1403
1404 commit refs/heads/sub
1405 mark :6
1406 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1407 data 11
1408 sub_second
1409 from :2
1410 M 100644 :5 file
1411
1412 commit refs/heads/subuse1
1413 mark :7
1414 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1415 data 7
1416 second
1417 from :4
1418 M 160000 :6 sub
1419
1420 INPUT_END
1421
1422 test_expect_success \
1423         'P: supermodule & submodule mix' \
1424         'git fast-import <input &&
1425          git checkout subuse1 &&
1426          rm -rf sub && mkdir sub && (cd sub &&
1427          git init &&
1428          git fetch --update-head-ok .. refs/heads/sub:refs/heads/master &&
1429          git checkout master) &&
1430          git submodule init &&
1431          git submodule update'
1432
1433 SUBLAST=$(git rev-parse --verify sub)
1434 SUBPREV=$(git rev-parse --verify sub^)
1435
1436 cat >input <<INPUT_END
1437 blob
1438 mark :1
1439 data <<DATAEND
1440 [submodule "sub"]
1441         path = sub
1442         url = "`pwd`/sub"
1443 DATAEND
1444
1445 commit refs/heads/subuse2
1446 mark :2
1447 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1448 data 8
1449 initial
1450 from refs/heads/master
1451 M 100644 :1 .gitmodules
1452 M 160000 $SUBPREV sub
1453
1454 commit refs/heads/subuse2
1455 mark :3
1456 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1457 data 7
1458 second
1459 from :2
1460 M 160000 $SUBLAST sub
1461
1462 INPUT_END
1463
1464 test_expect_success \
1465         'P: verbatim SHA gitlinks' \
1466         'git branch -D sub &&
1467          git gc && git prune &&
1468          git fast-import <input &&
1469          test $(git rev-parse --verify subuse2) = $(git rev-parse --verify subuse1)'
1470
1471 test_tick
1472 cat >input <<INPUT_END
1473 commit refs/heads/subuse3
1474 mark :1
1475 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1476 data <<COMMIT
1477 corrupt
1478 COMMIT
1479
1480 from refs/heads/subuse2
1481 M 160000 inline sub
1482 data <<DATA
1483 $SUBPREV
1484 DATA
1485
1486 INPUT_END
1487
1488 test_expect_success 'P: fail on inline gitlink' '
1489     test_must_fail git fast-import <input'
1490
1491 test_tick
1492 cat >input <<INPUT_END
1493 blob
1494 mark :1
1495 data <<DATA
1496 $SUBPREV
1497 DATA
1498
1499 commit refs/heads/subuse3
1500 mark :2
1501 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1502 data <<COMMIT
1503 corrupt
1504 COMMIT
1505
1506 from refs/heads/subuse2
1507 M 160000 :1 sub
1508
1509 INPUT_END
1510
1511 test_expect_success 'P: fail on blob mark in gitlink' '
1512     test_must_fail git fast-import <input'
1513
1514 ###
1515 ### series Q (notes)
1516 ###
1517
1518 note1_data="The first note for the first commit"
1519 note2_data="The first note for the second commit"
1520 note3_data="The first note for the third commit"
1521 note1b_data="The second note for the first commit"
1522 note1c_data="The third note for the first commit"
1523 note2b_data="The second note for the second commit"
1524
1525 test_tick
1526 cat >input <<INPUT_END
1527 blob
1528 mark :2
1529 data <<EOF
1530 $file2_data
1531 EOF
1532
1533 commit refs/heads/notes-test
1534 mark :3
1535 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1536 data <<COMMIT
1537 first (:3)
1538 COMMIT
1539
1540 M 644 :2 file2
1541
1542 blob
1543 mark :4
1544 data $file4_len
1545 $file4_data
1546 commit refs/heads/notes-test
1547 mark :5
1548 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1549 data <<COMMIT
1550 second (:5)
1551 COMMIT
1552
1553 M 644 :4 file4
1554
1555 commit refs/heads/notes-test
1556 mark :6
1557 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1558 data <<COMMIT
1559 third (:6)
1560 COMMIT
1561
1562 M 644 inline file5
1563 data <<EOF
1564 $file5_data
1565 EOF
1566
1567 M 755 inline file6
1568 data <<EOF
1569 $file6_data
1570 EOF
1571
1572 blob
1573 mark :7
1574 data <<EOF
1575 $note1_data
1576 EOF
1577
1578 blob
1579 mark :8
1580 data <<EOF
1581 $note2_data
1582 EOF
1583
1584 commit refs/notes/foobar
1585 mark :9
1586 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1587 data <<COMMIT
1588 notes (:9)
1589 COMMIT
1590
1591 N :7 :3
1592 N :8 :5
1593 N inline :6
1594 data <<EOF
1595 $note3_data
1596 EOF
1597
1598 commit refs/notes/foobar
1599 mark :10
1600 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1601 data <<COMMIT
1602 notes (:10)
1603 COMMIT
1604
1605 N inline :3
1606 data <<EOF
1607 $note1b_data
1608 EOF
1609
1610 commit refs/notes/foobar2
1611 mark :11
1612 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1613 data <<COMMIT
1614 notes (:11)
1615 COMMIT
1616
1617 N inline :3
1618 data <<EOF
1619 $note1c_data
1620 EOF
1621
1622 commit refs/notes/foobar
1623 mark :12
1624 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1625 data <<COMMIT
1626 notes (:12)
1627 COMMIT
1628
1629 deleteall
1630 N inline :5
1631 data <<EOF
1632 $note2b_data
1633 EOF
1634
1635 INPUT_END
1636
1637 test_expect_success \
1638         'Q: commit notes' \
1639         'git fast-import <input &&
1640          git whatchanged notes-test'
1641 test_expect_success \
1642         'Q: verify pack' \
1643         'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'
1644
1645 commit1=$(git rev-parse notes-test~2)
1646 commit2=$(git rev-parse notes-test^)
1647 commit3=$(git rev-parse notes-test)
1648
1649 cat >expect <<EOF
1650 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1651 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1652
1653 first (:3)
1654 EOF
1655 test_expect_success \
1656         'Q: verify first commit' \
1657         'git cat-file commit notes-test~2 | sed 1d >actual &&
1658         test_cmp expect actual'
1659
1660 cat >expect <<EOF
1661 parent $commit1
1662 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1663 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1664
1665 second (:5)
1666 EOF
1667 test_expect_success \
1668         'Q: verify second commit' \
1669         'git cat-file commit notes-test^ | sed 1d >actual &&
1670         test_cmp expect actual'
1671
1672 cat >expect <<EOF
1673 parent $commit2
1674 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1675 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1676
1677 third (:6)
1678 EOF
1679 test_expect_success \
1680         'Q: verify third commit' \
1681         'git cat-file commit notes-test | sed 1d >actual &&
1682         test_cmp expect actual'
1683
1684 cat >expect <<EOF
1685 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1686 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1687
1688 notes (:9)
1689 EOF
1690 test_expect_success \
1691         'Q: verify first notes commit' \
1692         'git cat-file commit refs/notes/foobar~2 | sed 1d >actual &&
1693         test_cmp expect actual'
1694
1695 cat >expect.unsorted <<EOF
1696 100644 blob $commit1
1697 100644 blob $commit2
1698 100644 blob $commit3
1699 EOF
1700 cat expect.unsorted | sort >expect
1701 test_expect_success \
1702         'Q: verify first notes tree' \
1703         'git cat-file -p refs/notes/foobar~2^{tree} | sed "s/ [0-9a-f]* / /" >actual &&
1704          test_cmp expect actual'
1705
1706 echo "$note1_data" >expect
1707 test_expect_success \
1708         'Q: verify first note for first commit' \
1709         'git cat-file blob refs/notes/foobar~2:$commit1 >actual && test_cmp expect actual'
1710
1711 echo "$note2_data" >expect
1712 test_expect_success \
1713         'Q: verify first note for second commit' \
1714         'git cat-file blob refs/notes/foobar~2:$commit2 >actual && test_cmp expect actual'
1715
1716 echo "$note3_data" >expect
1717 test_expect_success \
1718         'Q: verify first note for third commit' \
1719         'git cat-file blob refs/notes/foobar~2:$commit3 >actual && test_cmp expect actual'
1720
1721 cat >expect <<EOF
1722 parent `git rev-parse --verify refs/notes/foobar~2`
1723 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1724 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1725
1726 notes (:10)
1727 EOF
1728 test_expect_success \
1729         'Q: verify second notes commit' \
1730         'git cat-file commit refs/notes/foobar^ | sed 1d >actual &&
1731         test_cmp expect actual'
1732
1733 cat >expect.unsorted <<EOF
1734 100644 blob $commit1
1735 100644 blob $commit2
1736 100644 blob $commit3
1737 EOF
1738 cat expect.unsorted | sort >expect
1739 test_expect_success \
1740         'Q: verify second notes tree' \
1741         'git cat-file -p refs/notes/foobar^^{tree} | sed "s/ [0-9a-f]*  / /" >actual &&
1742          test_cmp expect actual'
1743
1744 echo "$note1b_data" >expect
1745 test_expect_success \
1746         'Q: verify second note for first commit' \
1747         'git cat-file blob refs/notes/foobar^:$commit1 >actual && test_cmp expect actual'
1748
1749 echo "$note2_data" >expect
1750 test_expect_success \
1751         'Q: verify first note for second commit' \
1752         'git cat-file blob refs/notes/foobar^:$commit2 >actual && test_cmp expect actual'
1753
1754 echo "$note3_data" >expect
1755 test_expect_success \
1756         'Q: verify first note for third commit' \
1757         'git cat-file blob refs/notes/foobar^:$commit3 >actual && test_cmp expect actual'
1758
1759 cat >expect <<EOF
1760 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1761 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1762
1763 notes (:11)
1764 EOF
1765 test_expect_success \
1766         'Q: verify third notes commit' \
1767         'git cat-file commit refs/notes/foobar2 | sed 1d >actual &&
1768         test_cmp expect actual'
1769
1770 cat >expect.unsorted <<EOF
1771 100644 blob $commit1
1772 EOF
1773 cat expect.unsorted | sort >expect
1774 test_expect_success \
1775         'Q: verify third notes tree' \
1776         'git cat-file -p refs/notes/foobar2^{tree} | sed "s/ [0-9a-f]*  / /" >actual &&
1777          test_cmp expect actual'
1778
1779 echo "$note1c_data" >expect
1780 test_expect_success \
1781         'Q: verify third note for first commit' \
1782         'git cat-file blob refs/notes/foobar2:$commit1 >actual && test_cmp expect actual'
1783
1784 cat >expect <<EOF
1785 parent `git rev-parse --verify refs/notes/foobar^`
1786 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1787 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1788
1789 notes (:12)
1790 EOF
1791 test_expect_success \
1792         'Q: verify fourth notes commit' \
1793         'git cat-file commit refs/notes/foobar | sed 1d >actual &&
1794         test_cmp expect actual'
1795
1796 cat >expect.unsorted <<EOF
1797 100644 blob $commit2
1798 EOF
1799 cat expect.unsorted | sort >expect
1800 test_expect_success \
1801         'Q: verify fourth notes tree' \
1802         'git cat-file -p refs/notes/foobar^{tree} | sed "s/ [0-9a-f]*   / /" >actual &&
1803          test_cmp expect actual'
1804
1805 echo "$note2b_data" >expect
1806 test_expect_success \
1807         'Q: verify second note for second commit' \
1808         'git cat-file blob refs/notes/foobar:$commit2 >actual && test_cmp expect actual'
1809
1810 ###
1811 ### series R (feature and option)
1812 ###
1813
1814 cat >input <<EOF
1815 feature no-such-feature-exists
1816 EOF
1817
1818 test_expect_success 'R: abort on unsupported feature' '
1819         test_must_fail git fast-import <input
1820 '
1821
1822 cat >input <<EOF
1823 feature date-format=now
1824 EOF
1825
1826 test_expect_success 'R: supported feature is accepted' '
1827         git fast-import <input
1828 '
1829
1830 cat >input << EOF
1831 blob
1832 data 3
1833 hi
1834 feature date-format=now
1835 EOF
1836
1837 test_expect_success 'R: abort on receiving feature after data command' '
1838         test_must_fail git fast-import <input
1839 '
1840
1841 cat >input << EOF
1842 feature import-marks=git.marks
1843 feature import-marks=git2.marks
1844 EOF
1845
1846 test_expect_success 'R: only one import-marks feature allowed per stream' '
1847         test_must_fail git fast-import <input
1848 '
1849
1850 cat >input << EOF
1851 feature export-marks=git.marks
1852 blob
1853 mark :1
1854 data 3
1855 hi
1856
1857 EOF
1858
1859 test_expect_success \
1860     'R: export-marks feature results in a marks file being created' \
1861     'cat input | git fast-import &&
1862     grep :1 git.marks'
1863
1864 test_expect_success \
1865     'R: export-marks options can be overriden by commandline options' \
1866     'cat input | git fast-import --export-marks=other.marks &&
1867     grep :1 other.marks'
1868
1869 test_expect_success 'R: catch typo in marks file name' '
1870         test_must_fail git fast-import --import-marks=nonexistent.marks </dev/null &&
1871         echo "feature import-marks=nonexistent.marks" |
1872         test_must_fail git fast-import
1873 '
1874
1875 test_expect_success 'R: import and output marks can be the same file' '
1876         rm -f io.marks &&
1877         blob=$(echo hi | git hash-object --stdin) &&
1878         cat >expect <<-EOF &&
1879         :1 $blob
1880         :2 $blob
1881         EOF
1882         git fast-import --export-marks=io.marks <<-\EOF &&
1883         blob
1884         mark :1
1885         data 3
1886         hi
1887
1888         EOF
1889         git fast-import --import-marks=io.marks --export-marks=io.marks <<-\EOF &&
1890         blob
1891         mark :2
1892         data 3
1893         hi
1894
1895         EOF
1896         test_cmp expect io.marks
1897 '
1898
1899 test_expect_success 'R: --import-marks=foo --output-marks=foo to create foo fails' '
1900         rm -f io.marks &&
1901         test_must_fail git fast-import --import-marks=io.marks --export-marks=io.marks <<-\EOF
1902         blob
1903         mark :1
1904         data 3
1905         hi
1906
1907         EOF
1908 '
1909
1910 test_expect_success 'R: --import-marks-if-exists' '
1911         rm -f io.marks &&
1912         blob=$(echo hi | git hash-object --stdin) &&
1913         echo ":1 $blob" >expect &&
1914         git fast-import --import-marks-if-exists=io.marks --export-marks=io.marks <<-\EOF &&
1915         blob
1916         mark :1
1917         data 3
1918         hi
1919
1920         EOF
1921         test_cmp expect io.marks
1922 '
1923
1924 cat >input << EOF
1925 feature import-marks=marks.out
1926 feature export-marks=marks.new
1927 EOF
1928
1929 test_expect_success \
1930     'R: import to output marks works without any content' \
1931     'cat input | git fast-import &&
1932     test_cmp marks.out marks.new'
1933
1934 cat >input <<EOF
1935 feature import-marks=nonexistant.marks
1936 feature export-marks=marks.new
1937 EOF
1938
1939 test_expect_success \
1940     'R: import marks prefers commandline marks file over the stream' \
1941     'cat input | git fast-import --import-marks=marks.out &&
1942     test_cmp marks.out marks.new'
1943
1944
1945 cat >input <<EOF
1946 feature import-marks=nonexistant.marks
1947 feature export-marks=combined.marks
1948 EOF
1949
1950 test_expect_success 'R: multiple --import-marks= should be honoured' '
1951     head -n2 marks.out > one.marks &&
1952     tail -n +3 marks.out > two.marks &&
1953     git fast-import --import-marks=one.marks --import-marks=two.marks <input &&
1954     test_cmp marks.out combined.marks
1955 '
1956
1957 cat >input <<EOF
1958 feature relative-marks
1959 feature import-marks=relative.in
1960 feature export-marks=relative.out
1961 EOF
1962
1963 test_expect_success 'R: feature relative-marks should be honoured' '
1964     mkdir -p .git/info/fast-import/ &&
1965     cp marks.new .git/info/fast-import/relative.in &&
1966     git fast-import <input &&
1967     test_cmp marks.new .git/info/fast-import/relative.out
1968 '
1969
1970 cat >input <<EOF
1971 feature relative-marks
1972 feature import-marks=relative.in
1973 feature no-relative-marks
1974 feature export-marks=non-relative.out
1975 EOF
1976
1977 test_expect_success 'R: feature no-relative-marks should be honoured' '
1978     git fast-import <input &&
1979     test_cmp marks.new non-relative.out
1980 '
1981
1982 test_expect_success 'R: feature ls supported' '
1983         echo "feature ls" |
1984         git fast-import
1985 '
1986
1987 test_expect_success 'R: feature cat-blob supported' '
1988         echo "feature cat-blob" |
1989         git fast-import
1990 '
1991
1992 test_expect_success 'R: cat-blob-fd must be a nonnegative integer' '
1993         test_must_fail git fast-import --cat-blob-fd=-1 </dev/null
1994 '
1995
1996 test_expect_success 'R: print old blob' '
1997         blob=$(echo "yes it can" | git hash-object -w --stdin) &&
1998         cat >expect <<-EOF &&
1999         ${blob} blob 11
2000         yes it can
2001
2002         EOF
2003         echo "cat-blob $blob" |
2004         git fast-import --cat-blob-fd=6 6>actual &&
2005         test_cmp expect actual
2006 '
2007
2008 test_expect_success 'R: in-stream cat-blob-fd not respected' '
2009         echo hello >greeting &&
2010         blob=$(git hash-object -w greeting) &&
2011         cat >expect <<-EOF &&
2012         ${blob} blob 6
2013         hello
2014
2015         EOF
2016         git fast-import --cat-blob-fd=3 3>actual.3 >actual.1 <<-EOF &&
2017         cat-blob $blob
2018         EOF
2019         test_cmp expect actual.3 &&
2020         test_cmp empty actual.1 &&
2021         git fast-import 3>actual.3 >actual.1 <<-EOF &&
2022         option cat-blob-fd=3
2023         cat-blob $blob
2024         EOF
2025         test_cmp empty actual.3 &&
2026         test_cmp expect actual.1
2027 '
2028
2029 test_expect_success 'R: print new blob' '
2030         blob=$(echo "yep yep yep" | git hash-object --stdin) &&
2031         cat >expect <<-EOF &&
2032         ${blob} blob 12
2033         yep yep yep
2034
2035         EOF
2036         git fast-import --cat-blob-fd=6 6>actual <<-\EOF &&
2037         blob
2038         mark :1
2039         data <<BLOB_END
2040         yep yep yep
2041         BLOB_END
2042         cat-blob :1
2043         EOF
2044         test_cmp expect actual
2045 '
2046
2047 test_expect_success 'R: print new blob by sha1' '
2048         blob=$(echo "a new blob named by sha1" | git hash-object --stdin) &&
2049         cat >expect <<-EOF &&
2050         ${blob} blob 25
2051         a new blob named by sha1
2052
2053         EOF
2054         git fast-import --cat-blob-fd=6 6>actual <<-EOF &&
2055         blob
2056         data <<BLOB_END
2057         a new blob named by sha1
2058         BLOB_END
2059         cat-blob $blob
2060         EOF
2061         test_cmp expect actual
2062 '
2063
2064 test_expect_success 'setup: big file' '
2065         (
2066                 echo "the quick brown fox jumps over the lazy dog" >big &&
2067                 for i in 1 2 3
2068                 do
2069                         cat big big big big >bigger &&
2070                         cat bigger bigger bigger bigger >big ||
2071                         exit
2072                 done
2073         )
2074 '
2075
2076 test_expect_success 'R: print two blobs to stdout' '
2077         blob1=$(git hash-object big) &&
2078         blob1_len=$(wc -c <big) &&
2079         blob2=$(echo hello | git hash-object --stdin) &&
2080         {
2081                 echo ${blob1} blob $blob1_len &&
2082                 cat big &&
2083                 cat <<-EOF
2084
2085                 ${blob2} blob 6
2086                 hello
2087
2088                 EOF
2089         } >expect &&
2090         {
2091                 cat <<-\END_PART1 &&
2092                         blob
2093                         mark :1
2094                         data <<data_end
2095                 END_PART1
2096                 cat big &&
2097                 cat <<-\EOF
2098                         data_end
2099                         blob
2100                         mark :2
2101                         data <<data_end
2102                         hello
2103                         data_end
2104                         cat-blob :1
2105                         cat-blob :2
2106                 EOF
2107         } |
2108         git fast-import >actual &&
2109         test_cmp expect actual
2110 '
2111
2112 test_expect_success PIPE 'R: copy using cat-file' '
2113         expect_id=$(git hash-object big) &&
2114         expect_len=$(wc -c <big) &&
2115         echo $expect_id blob $expect_len >expect.response &&
2116
2117         rm -f blobs &&
2118         cat >frontend <<-\FRONTEND_END &&
2119         #!/bin/sh
2120         FRONTEND_END
2121
2122         mkfifo blobs &&
2123         (
2124                 export GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL GIT_COMMITTER_DATE &&
2125                 cat <<-\EOF &&
2126                 feature cat-blob
2127                 blob
2128                 mark :1
2129                 data <<BLOB
2130                 EOF
2131                 cat big &&
2132                 cat <<-\EOF &&
2133                 BLOB
2134                 cat-blob :1
2135                 EOF
2136
2137                 read blob_id type size <&3 &&
2138                 echo "$blob_id $type $size" >response &&
2139                 head_c $size >blob <&3 &&
2140                 read newline <&3 &&
2141
2142                 cat <<-EOF &&
2143                 commit refs/heads/copied
2144                 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
2145                 data <<COMMIT
2146                 copy big file as file3
2147                 COMMIT
2148                 M 644 inline file3
2149                 data <<BLOB
2150                 EOF
2151                 cat blob &&
2152                 echo BLOB
2153         ) 3<blobs |
2154         git fast-import --cat-blob-fd=3 3>blobs &&
2155         git show copied:file3 >actual &&
2156         test_cmp expect.response response &&
2157         test_cmp big actual
2158 '
2159
2160 test_expect_success PIPE 'R: print blob mid-commit' '
2161         rm -f blobs &&
2162         echo "A blob from _before_ the commit." >expect &&
2163         mkfifo blobs &&
2164         (
2165                 exec 3<blobs &&
2166                 cat <<-EOF &&
2167                 feature cat-blob
2168                 blob
2169                 mark :1
2170                 data <<BLOB
2171                 A blob from _before_ the commit.
2172                 BLOB
2173                 commit refs/heads/temporary
2174                 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
2175                 data <<COMMIT
2176                 Empty commit
2177                 COMMIT
2178                 cat-blob :1
2179                 EOF
2180
2181                 read blob_id type size <&3 &&
2182                 head_c $size >actual <&3 &&
2183                 read newline <&3 &&
2184
2185                 echo
2186         ) |
2187         git fast-import --cat-blob-fd=3 3>blobs &&
2188         test_cmp expect actual
2189 '
2190
2191 test_expect_success PIPE 'R: print staged blob within commit' '
2192         rm -f blobs &&
2193         echo "A blob from _within_ the commit." >expect &&
2194         mkfifo blobs &&
2195         (
2196                 exec 3<blobs &&
2197                 cat <<-EOF &&
2198                 feature cat-blob
2199                 commit refs/heads/within
2200                 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
2201                 data <<COMMIT
2202                 Empty commit
2203                 COMMIT
2204                 M 644 inline within
2205                 data <<BLOB
2206                 A blob from _within_ the commit.
2207                 BLOB
2208                 EOF
2209
2210                 to_get=$(
2211                         echo "A blob from _within_ the commit." |
2212                         git hash-object --stdin
2213                 ) &&
2214                 echo "cat-blob $to_get" &&
2215
2216                 read blob_id type size <&3 &&
2217                 head_c $size >actual <&3 &&
2218                 read newline <&3 &&
2219
2220                 echo deleteall
2221         ) |
2222         git fast-import --cat-blob-fd=3 3>blobs &&
2223         test_cmp expect actual
2224 '
2225
2226 cat >input << EOF
2227 option git quiet
2228 blob
2229 data 3
2230 hi
2231
2232 EOF
2233
2234 test_expect_success 'R: quiet option results in no stats being output' '
2235     cat input | git fast-import 2> output &&
2236     test_cmp empty output
2237 '
2238
2239 cat >input <<EOF
2240 option git non-existing-option
2241 EOF
2242
2243 test_expect_success 'R: die on unknown option' '
2244     test_must_fail git fast-import <input
2245 '
2246
2247 test_expect_success 'R: unknown commandline options are rejected' '\
2248     test_must_fail git fast-import --non-existing-option < /dev/null
2249 '
2250
2251 test_expect_success 'R: die on invalid option argument' '
2252         echo "option git active-branches=-5" |
2253         test_must_fail git fast-import &&
2254         echo "option git depth=" |
2255         test_must_fail git fast-import &&
2256         test_must_fail git fast-import --depth="5 elephants" </dev/null
2257 '
2258
2259 cat >input <<EOF
2260 option non-existing-vcs non-existing-option
2261 EOF
2262
2263 test_expect_success 'R: ignore non-git options' '
2264     git fast-import <input
2265 '
2266
2267 ##
2268 ## R: very large blobs
2269 ##
2270 blobsize=$((2*1024*1024 + 53))
2271 test-genrandom bar $blobsize >expect
2272 cat >input <<INPUT_END
2273 commit refs/heads/big-file
2274 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
2275 data <<COMMIT
2276 R - big file
2277 COMMIT
2278
2279 M 644 inline big1
2280 data $blobsize
2281 INPUT_END
2282 cat expect >>input
2283 cat >>input <<INPUT_END
2284 M 644 inline big2
2285 data $blobsize
2286 INPUT_END
2287 cat expect >>input
2288 echo >>input
2289
2290 test_expect_success \
2291         'R: blob bigger than threshold' \
2292         'test_create_repo R &&
2293          git --git-dir=R/.git fast-import --big-file-threshold=1 <input'
2294 test_expect_success \
2295         'R: verify created pack' \
2296         ': >verify &&
2297          for p in R/.git/objects/pack/*.pack;
2298          do
2299            git verify-pack -v $p >>verify || exit;
2300          done'
2301 test_expect_success \
2302         'R: verify written objects' \
2303         'git --git-dir=R/.git cat-file blob big-file:big1 >actual &&
2304          test_cmp expect actual &&
2305          a=$(git --git-dir=R/.git rev-parse big-file:big1) &&
2306          b=$(git --git-dir=R/.git rev-parse big-file:big2) &&
2307          test $a = $b'
2308 test_expect_success \
2309         'R: blob appears only once' \
2310         'n=$(grep $a verify | wc -l) &&
2311          test 1 = $n'
2312
2313 test_done