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 tag series-A-blob
  98 from :3
  99 data <<EOF
 100 An annotated tag that annotates a blob.
 101 EOF
 102
 103 INPUT_END
 104 test_expect_success \
 105     'A: create pack from stdin' \
 106     'git fast-import --export-marks=marks.out <input &&
 107          git whatchanged master'
 108 test_expect_success \
 109         'A: verify pack' \
 110         'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'
 111
 112 cat >expect <<EOF
 113 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 114 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 115
 116 initial
 117 EOF
 118 test_expect_success \
 119         'A: verify commit' \
 120         'git cat-file commit master | sed 1d >actual &&
 121         test_cmp expect actual'
 122
 123 cat >expect <<EOF
 124 100644 blob file2
 125 100644 blob file3
 126 100755 blob file4
 127 EOF
 128 test_expect_success \
 129         'A: verify tree' \
 130         'git cat-file -p master^{tree} | sed "s/ [0-9a-f]*      / /" >actual &&
 131          test_cmp expect actual'
 132
 133 echo "$file2_data" >expect
 134 test_expect_success \
 135         'A: verify file2' \
 136         'git cat-file blob master:file2 >actual && test_cmp expect actual'
 137
 138 echo "$file3_data" >expect
 139 test_expect_success \
 140         'A: verify file3' \
 141         'git cat-file blob master:file3 >actual && test_cmp expect actual'
 142
 143 printf "$file4_data" >expect
 144 test_expect_success \
 145         'A: verify file4' \
 146         'git cat-file blob master:file4 >actual && test_cmp expect actual'
 147
 148 cat >expect <<EOF
 149 object $(git rev-parse refs/heads/master)
 150 type commit
 151 tag series-A
 152
 153 An annotated tag without a tagger
 154 EOF
 155 test_expect_success 'A: verify tag/series-A' '
 156         git cat-file tag tags/series-A >actual &&
 157         test_cmp expect actual
 158 '
 159
 160 cat >expect <<EOF
 161 object $(git rev-parse refs/heads/master:file3)
 162 type blob
 163 tag series-A-blob
 164
 165 An annotated tag that annotates a blob.
 166 EOF
 167 test_expect_success 'A: verify tag/series-A-blob' '
 168         git cat-file tag tags/series-A-blob >actual &&
 169         test_cmp expect actual
 170 '
 171
 172 cat >expect <<EOF
 173 :2 `git rev-parse --verify master:file2`
 174 :3 `git rev-parse --verify master:file3`
 175 :4 `git rev-parse --verify master:file4`
 176 :5 `git rev-parse --verify master^0`
 177 EOF
 178 test_expect_success \
 179         'A: verify marks output' \
 180         'test_cmp expect marks.out'
 181
 182 test_expect_success \
 183         'A: verify marks import' \
 184         'git fast-import \
 185                 --import-marks=marks.out \
 186                 --export-marks=marks.new \
 187                 </dev/null &&
 188         test_cmp expect marks.new'
 189
 190 test_tick
 191 new_blob=$(echo testing | git hash-object --stdin)
 192 cat >input <<INPUT_END
 193 tag series-A-blob-2
 194 from $(git rev-parse refs/heads/master:file3)
 195 data <<EOF
 196 Tag blob by sha1.
 197 EOF
 198
 199 blob
 200 mark :6
 201 data <<EOF
 202 testing
 203 EOF
 204
 205 commit refs/heads/new_blob
 206 committer  <> 0 +0000
 207 data 0
 208 M 644 :6 new_blob
 209 #pretend we got sha1 from fast-import
 210 ls "new_blob"
 211
 212 tag series-A-blob-3
 213 from $new_blob
 214 data <<EOF
 215 Tag new_blob.
 216 EOF
 217 INPUT_END
 218
 219 cat >expect <<EOF
 220 object $(git rev-parse refs/heads/master:file3)
 221 type blob
 222 tag series-A-blob-2
 223
 224 Tag blob by sha1.
 225 object $new_blob
 226 type blob
 227 tag series-A-blob-3
 228
 229 Tag new_blob.
 230 EOF
 231
 232 test_expect_success \
 233         'A: tag blob by sha1' \
 234         'git fast-import <input &&
 235         git cat-file tag tags/series-A-blob-2 >actual &&
 236         git cat-file tag tags/series-A-blob-3 >>actual &&
 237         test_cmp expect actual'
 238
 239 test_tick
 240 cat >input <<INPUT_END
 241 commit refs/heads/verify--import-marks
 242 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 243 data <<COMMIT
 244 recreate from :5
 245 COMMIT
 246
 247 from :5
 248 M 755 :2 copy-of-file2
 249
 250 INPUT_END
 251 test_expect_success \
 252         'A: verify marks import does not crash' \
 253         'git fast-import --import-marks=marks.out <input &&
 254          git whatchanged verify--import-marks'
 255 test_expect_success \
 256         'A: verify pack' \
 257         'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'
 258 cat >expect <<EOF
 259 :000000 100755 0000000000000000000000000000000000000000 7123f7f44e39be127c5eb701e5968176ee9d78b1 A      copy-of-file2
 260 EOF
 261 git diff-tree -M -r master verify--import-marks >actual
 262 test_expect_success \
 263         'A: verify diff' \
 264         'compare_diff_raw expect actual &&
 265          test `git rev-parse --verify master:file2` \
 266             = `git rev-parse --verify verify--import-marks:copy-of-file2`'
 267
 268 test_tick
 269 mt=$(git hash-object --stdin < /dev/null)
 270 : >input.blob
 271 : >marks.exp
 272 : >tree.exp
 273
 274 cat >input.commit <<EOF
 275 commit refs/heads/verify--dump-marks
 276 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 277 data <<COMMIT
 278 test the sparse array dumping routines with exponentially growing marks
 279 COMMIT
 280 EOF
 281
 282 i=0
 283 l=4
 284 m=6
 285 n=7
 286 while test "$i" -lt 27; do
 287     cat >>input.blob <<EOF
 288 blob
 289 mark :$l
 290 data 0
 291 blob
 292 mark :$m
 293 data 0
 294 blob
 295 mark :$n
 296 data 0
 297 EOF
 298     echo "M 100644 :$l l$i" >>input.commit
 299     echo "M 100644 :$m m$i" >>input.commit
 300     echo "M 100644 :$n n$i" >>input.commit
 301
 302     echo ":$l $mt" >>marks.exp
 303     echo ":$m $mt" >>marks.exp
 304     echo ":$n $mt" >>marks.exp
 305
 306     printf "100644 blob $mt\tl$i\n" >>tree.exp
 307     printf "100644 blob $mt\tm$i\n" >>tree.exp
 308     printf "100644 blob $mt\tn$i\n" >>tree.exp
 309
 310     l=$(($l + $l))
 311     m=$(($m + $m))
 312     n=$(($l + $n))
 313
 314     i=$((1 + $i))
 315 done
 316
 317 sort tree.exp > tree.exp_s
 318
 319 test_expect_success 'A: export marks with large values' '
 320         cat input.blob input.commit | git fast-import --export-marks=marks.large &&
 321         git ls-tree refs/heads/verify--dump-marks >tree.out &&
 322         test_cmp tree.exp_s tree.out &&
 323         test_cmp marks.exp marks.large'
 324
 325 ###
 326 ### series B
 327 ###
 328
 329 test_tick
 330 cat >input <<INPUT_END
 331 commit refs/heads/branch
 332 mark :1
 333 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 334 data <<COMMIT
 335 corrupt
 336 COMMIT
 337
 338 from refs/heads/master
 339 M 755 0000000000000000000000000000000000000001 zero1
 340
 341 INPUT_END
 342 test_expect_success 'B: fail on invalid blob sha1' '
 343     test_must_fail git fast-import <input
 344 '
 345 rm -f .git/objects/pack_* .git/objects/index_*
 346
 347 cat >input <<INPUT_END
 348 commit .badbranchname
 349 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 350 data <<COMMIT
 351 corrupt
 352 COMMIT
 353
 354 from refs/heads/master
 355
 356 INPUT_END
 357 test_expect_success 'B: fail on invalid branch name ".badbranchname"' '
 358     test_must_fail git fast-import <input
 359 '
 360 rm -f .git/objects/pack_* .git/objects/index_*
 361
 362 cat >input <<INPUT_END
 363 commit bad[branch]name
 364 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 365 data <<COMMIT
 366 corrupt
 367 COMMIT
 368
 369 from refs/heads/master
 370
 371 INPUT_END
 372 test_expect_success 'B: fail on invalid branch name "bad[branch]name"' '
 373     test_must_fail git fast-import <input
 374 '
 375 rm -f .git/objects/pack_* .git/objects/index_*
 376
 377 cat >input <<INPUT_END
 378 commit TEMP_TAG
 379 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 380 data <<COMMIT
 381 tag base
 382 COMMIT
 383
 384 from refs/heads/master
 385
 386 INPUT_END
 387 test_expect_success \
 388     'B: accept branch name "TEMP_TAG"' \
 389     'git fast-import <input &&
 390          test -f .git/TEMP_TAG &&
 391          test `git rev-parse master` = `git rev-parse TEMP_TAG^`'
 392 rm -f .git/TEMP_TAG
 393
 394 git gc 2>/dev/null >/dev/null
 395 git prune 2>/dev/null >/dev/null
 396
 397 cat >input <<INPUT_END
 398 commit refs/heads/empty-committer-1
 399 committer  <> $GIT_COMMITTER_DATE
 400 data <<COMMIT
 401 empty commit
 402 COMMIT
 403 INPUT_END
 404 test_expect_success 'B: accept empty committer' '
 405         git fast-import <input &&
 406         out=$(git fsck) &&
 407         echo "$out" &&
 408         test -z "$out"
 409 '
 410 git update-ref -d refs/heads/empty-committer-1 || true
 411
 412 git gc 2>/dev/null >/dev/null
 413 git prune 2>/dev/null >/dev/null
 414
 415 cat >input <<INPUT_END
 416 commit refs/heads/empty-committer-2
 417 committer <a@b.com> $GIT_COMMITTER_DATE
 418 data <<COMMIT
 419 empty commit
 420 COMMIT
 421 INPUT_END
 422 test_expect_success 'B: accept and fixup committer with no name' '
 423         git fast-import <input &&
 424         out=$(git fsck) &&
 425         echo "$out" &&
 426         test -z "$out"
 427 '
 428 git update-ref -d refs/heads/empty-committer-2 || true
 429
 430 git gc 2>/dev/null >/dev/null
 431 git prune 2>/dev/null >/dev/null
 432
 433 cat >input <<INPUT_END
 434 commit refs/heads/invalid-committer
 435 committer Name email> $GIT_COMMITTER_DATE
 436 data <<COMMIT
 437 empty commit
 438 COMMIT
 439 INPUT_END
 440 test_expect_success 'B: fail on invalid committer (1)' '
 441         test_must_fail git fast-import <input
 442 '
 443 git update-ref -d refs/heads/invalid-committer || true
 444
 445 cat >input <<INPUT_END
 446 commit refs/heads/invalid-committer
 447 committer Name <e<mail> $GIT_COMMITTER_DATE
 448 data <<COMMIT
 449 empty commit
 450 COMMIT
 451 INPUT_END
 452 test_expect_success 'B: fail on invalid committer (2)' '
 453         test_must_fail git fast-import <input
 454 '
 455 git update-ref -d refs/heads/invalid-committer || true
 456
 457 cat >input <<INPUT_END
 458 commit refs/heads/invalid-committer
 459 committer Name <email>> $GIT_COMMITTER_DATE
 460 data <<COMMIT
 461 empty commit
 462 COMMIT
 463 INPUT_END
 464 test_expect_success 'B: fail on invalid committer (3)' '
 465         test_must_fail git fast-import <input
 466 '
 467 git update-ref -d refs/heads/invalid-committer || true
 468
 469 cat >input <<INPUT_END
 470 commit refs/heads/invalid-committer
 471 committer Name <email $GIT_COMMITTER_DATE
 472 data <<COMMIT
 473 empty commit
 474 COMMIT
 475 INPUT_END
 476 test_expect_success 'B: fail on invalid committer (4)' '
 477         test_must_fail git fast-import <input
 478 '
 479 git update-ref -d refs/heads/invalid-committer || true
 480
 481 cat >input <<INPUT_END
 482 commit refs/heads/invalid-committer
 483 committer Name<email> $GIT_COMMITTER_DATE
 484 data <<COMMIT
 485 empty commit
 486 COMMIT
 487 INPUT_END
 488 test_expect_success 'B: fail on invalid committer (5)' '
 489         test_must_fail git fast-import <input
 490 '
 491 git update-ref -d refs/heads/invalid-committer || true
 492
 493 ###
 494 ### series C
 495 ###
 496
 497 newf=`echo hi newf | git hash-object -w --stdin`
 498 oldf=`git rev-parse --verify master:file2`
 499 test_tick
 500 cat >input <<INPUT_END
 501 commit refs/heads/branch
 502 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 503 data <<COMMIT
 504 second
 505 COMMIT
 506
 507 from refs/heads/master
 508 M 644 $oldf file2/oldf
 509 M 755 $newf file2/newf
 510 D file3
 511
 512 INPUT_END
 513 test_expect_success \
 514     'C: incremental import create pack from stdin' \
 515     'git fast-import <input &&
 516          git whatchanged branch'
 517 test_expect_success \
 518         'C: verify pack' \
 519         'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'
 520 test_expect_success \
 521         'C: validate reuse existing blob' \
 522         'test $newf = `git rev-parse --verify branch:file2/newf` &&
 523          test $oldf = `git rev-parse --verify branch:file2/oldf`'
 524
 525 cat >expect <<EOF
 526 parent `git rev-parse --verify master^0`
 527 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 528 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 529
 530 second
 531 EOF
 532 test_expect_success \
 533         'C: verify commit' \
 534         'git cat-file commit branch | sed 1d >actual &&
 535          test_cmp expect actual'
 536
 537 cat >expect <<EOF
 538 :000000 100755 0000000000000000000000000000000000000000 f1fb5da718392694d0076d677d6d0e364c79b0bc A      file2/newf
 539 :100644 100644 7123f7f44e39be127c5eb701e5968176ee9d78b1 7123f7f44e39be127c5eb701e5968176ee9d78b1 R100   file2   file2/oldf
 540 :100644 000000 0d92e9f3374ae2947c23aa477cbc68ce598135f1 0000000000000000000000000000000000000000 D      file3
 541 EOF
 542 git diff-tree -M -r master branch >actual
 543 test_expect_success \
 544         'C: validate rename result' \
 545         'compare_diff_raw expect actual'
 546
 547 ###
 548 ### series D
 549 ###
 550
 551 test_tick
 552 cat >input <<INPUT_END
 553 commit refs/heads/branch
 554 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 555 data <<COMMIT
 556 third
 557 COMMIT
 558
 559 from refs/heads/branch^0
 560 M 644 inline newdir/interesting
 561 data <<EOF
 562 $file5_data
 563 EOF
 564
 565 M 755 inline newdir/exec.sh
 566 data <<EOF
 567 $file6_data
 568 EOF
 569
 570 INPUT_END
 571 test_expect_success \
 572     'D: inline data in commit' \
 573     'git fast-import <input &&
 574          git whatchanged branch'
 575 test_expect_success \
 576         'D: verify pack' \
 577         'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'
 578
 579 cat >expect <<EOF
 580 :000000 100755 0000000000000000000000000000000000000000 35a59026a33beac1569b1c7f66f3090ce9c09afc A      newdir/exec.sh
 581 :000000 100644 0000000000000000000000000000000000000000 046d0371e9220107917db0d0e030628de8a1de9b A      newdir/interesting
 582 EOF
 583 git diff-tree -M -r branch^ branch >actual
 584 test_expect_success \
 585         'D: validate new files added' \
 586         'compare_diff_raw expect actual'
 587
 588 echo "$file5_data" >expect
 589 test_expect_success \
 590         'D: verify file5' \
 591         'git cat-file blob branch:newdir/interesting >actual &&
 592          test_cmp expect actual'
 593
 594 echo "$file6_data" >expect
 595 test_expect_success \
 596         'D: verify file6' \
 597         'git cat-file blob branch:newdir/exec.sh >actual &&
 598          test_cmp expect actual'
 599
 600 ###
 601 ### series E
 602 ###
 603
 604 cat >input <<INPUT_END
 605 commit refs/heads/branch
 606 author $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> Tue Feb 6 11:22:18 2007 -0500
 607 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> Tue Feb 6 12:35:02 2007 -0500
 608 data <<COMMIT
 609 RFC 2822 type date
 610 COMMIT
 611
 612 from refs/heads/branch^0
 613
 614 INPUT_END
 615 test_expect_success 'E: rfc2822 date, --date-format=raw' '
 616     test_must_fail git fast-import --date-format=raw <input
 617 '
 618 test_expect_success \
 619     'E: rfc2822 date, --date-format=rfc2822' \
 620     'git fast-import --date-format=rfc2822 <input'
 621 test_expect_success \
 622         'E: verify pack' \
 623         'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'
 624
 625 cat >expect <<EOF
 626 author $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> 1170778938 -0500
 627 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1170783302 -0500
 628
 629 RFC 2822 type date
 630 EOF
 631 test_expect_success \
 632         'E: verify commit' \
 633         'git cat-file commit branch | sed 1,2d >actual &&
 634         test_cmp expect actual'
 635
 636 ###
 637 ### series F
 638 ###
 639
 640 old_branch=`git rev-parse --verify branch^0`
 641 test_tick
 642 cat >input <<INPUT_END
 643 commit refs/heads/branch
 644 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 645 data <<COMMIT
 646 losing things already?
 647 COMMIT
 648
 649 from refs/heads/branch~1
 650
 651 reset refs/heads/other
 652 from refs/heads/branch
 653
 654 INPUT_END
 655 test_expect_success \
 656     'F: non-fast-forward update skips' \
 657     'if git fast-import <input
 658          then
 659                 echo BAD gfi did not fail
 660                 return 1
 661          else
 662                 if test $old_branch = `git rev-parse --verify branch^0`
 663                 then
 664                         : branch unaffected and failure returned
 665                         return 0
 666                 else
 667                         echo BAD gfi changed branch $old_branch
 668                         return 1
 669                 fi
 670          fi
 671         '
 672 test_expect_success \
 673         'F: verify pack' \
 674         'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'
 675
 676 cat >expect <<EOF
 677 tree `git rev-parse branch~1^{tree}`
 678 parent `git rev-parse branch~1`
 679 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 680 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 681
 682 losing things already?
 683 EOF
 684 test_expect_success \
 685         'F: verify other commit' \
 686         'git cat-file commit other >actual &&
 687         test_cmp expect actual'
 688
 689 ###
 690 ### series G
 691 ###
 692
 693 old_branch=`git rev-parse --verify branch^0`
 694 test_tick
 695 cat >input <<INPUT_END
 696 commit refs/heads/branch
 697 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 698 data <<COMMIT
 699 losing things already?
 700 COMMIT
 701
 702 from refs/heads/branch~1
 703
 704 INPUT_END
 705 test_expect_success \
 706     'G: non-fast-forward update forced' \
 707     'git fast-import --force <input'
 708 test_expect_success \
 709         'G: verify pack' \
 710         'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'
 711 test_expect_success \
 712         'G: branch changed, but logged' \
 713         'test $old_branch != `git rev-parse --verify branch^0` &&
 714          test $old_branch = `git rev-parse --verify branch@{1}`'
 715
 716 ###
 717 ### series H
 718 ###
 719
 720 test_tick
 721 cat >input <<INPUT_END
 722 commit refs/heads/H
 723 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 724 data <<COMMIT
 725 third
 726 COMMIT
 727
 728 from refs/heads/branch^0
 729 M 644 inline i-will-die
 730 data <<EOF
 731 this file will never exist.
 732 EOF
 733
 734 deleteall
 735 M 644 inline h/e/l/lo
 736 data <<EOF
 737 $file5_data
 738 EOF
 739
 740 INPUT_END
 741 test_expect_success \
 742     'H: deletall, add 1' \
 743     'git fast-import <input &&
 744          git whatchanged H'
 745 test_expect_success \
 746         'H: verify pack' \
 747         'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'
 748
 749 cat >expect <<EOF
 750 :100755 000000 f1fb5da718392694d0076d677d6d0e364c79b0bc 0000000000000000000000000000000000000000 D      file2/newf
 751 :100644 000000 7123f7f44e39be127c5eb701e5968176ee9d78b1 0000000000000000000000000000000000000000 D      file2/oldf
 752 :100755 000000 85df50785d62d3b05ab03d9cbf7e4a0b49449730 0000000000000000000000000000000000000000 D      file4
 753 :100644 100644 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 R100   newdir/interesting      h/e/l/lo
 754 :100755 000000 e74b7d465e52746be2b4bae983670711e6e66657 0000000000000000000000000000000000000000 D      newdir/exec.sh
 755 EOF
 756 git diff-tree -M -r H^ H >actual
 757 test_expect_success \
 758         'H: validate old files removed, new files added' \
 759         'compare_diff_raw expect actual'
 760
 761 echo "$file5_data" >expect
 762 test_expect_success \
 763         'H: verify file' \
 764         'git cat-file blob H:h/e/l/lo >actual &&
 765          test_cmp expect actual'
 766
 767 ###
 768 ### series I
 769 ###
 770
 771 cat >input <<INPUT_END
 772 commit refs/heads/export-boundary
 773 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 774 data <<COMMIT
 775 we have a border.  its only 40 characters wide.
 776 COMMIT
 777
 778 from refs/heads/branch
 779
 780 INPUT_END
 781 test_expect_success \
 782     'I: export-pack-edges' \
 783     'git fast-import --export-pack-edges=edges.list <input'
 784
 785 cat >expect <<EOF
 786 .git/objects/pack/pack-.pack: `git rev-parse --verify export-boundary`
 787 EOF
 788 test_expect_success \
 789         'I: verify edge list' \
 790         'sed -e s/pack-.*pack/pack-.pack/ edges.list >actual &&
 791          test_cmp expect actual'
 792
 793 ###
 794 ### series J
 795 ###
 796
 797 cat >input <<INPUT_END
 798 commit refs/heads/J
 799 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 800 data <<COMMIT
 801 create J
 802 COMMIT
 803
 804 from refs/heads/branch
 805
 806 reset refs/heads/J
 807
 808 commit refs/heads/J
 809 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 810 data <<COMMIT
 811 initialize J
 812 COMMIT
 813
 814 INPUT_END
 815 test_expect_success \
 816     'J: reset existing branch creates empty commit' \
 817     'git fast-import <input'
 818 test_expect_success \
 819         'J: branch has 1 commit, empty tree' \
 820         'test 1 = `git rev-list J | wc -l` &&
 821          test 0 = `git ls-tree J | wc -l`'
 822
 823 cat >input <<INPUT_END
 824 reset refs/heads/J2
 825
 826 tag wrong_tag
 827 from refs/heads/J2
 828 data <<EOF
 829 Tag branch that was reset.
 830 EOF
 831 INPUT_END
 832 test_expect_success \
 833         'J: tag must fail on empty branch' \
 834         'test_must_fail git fast-import <input'
 835 ###
 836 ### series K
 837 ###
 838
 839 cat >input <<INPUT_END
 840 commit refs/heads/K
 841 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 842 data <<COMMIT
 843 create K
 844 COMMIT
 845
 846 from refs/heads/branch
 847
 848 commit refs/heads/K
 849 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 850 data <<COMMIT
 851 redo K
 852 COMMIT
 853
 854 from refs/heads/branch^1
 855
 856 INPUT_END
 857 test_expect_success \
 858     'K: reinit branch with from' \
 859     'git fast-import <input'
 860 test_expect_success \
 861     'K: verify K^1 = branch^1' \
 862     'test `git rev-parse --verify branch^1` \
 863                 = `git rev-parse --verify K^1`'
 864
 865 ###
 866 ### series L
 867 ###
 868
 869 cat >input <<INPUT_END
 870 blob
 871 mark :1
 872 data <<EOF
 873 some data
 874 EOF
 875
 876 blob
 877 mark :2
 878 data <<EOF
 879 other data
 880 EOF
 881
 882 commit refs/heads/L
 883 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 884 data <<COMMIT
 885 create L
 886 COMMIT
 887
 888 M 644 :1 b.
 889 M 644 :1 b/other
 890 M 644 :1 ba
 891
 892 commit refs/heads/L
 893 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 894 data <<COMMIT
 895 update L
 896 COMMIT
 897
 898 M 644 :2 b.
 899 M 644 :2 b/other
 900 M 644 :2 ba
 901 INPUT_END
 902
 903 cat >expect <<EXPECT_END
 904 :100644 100644 4268632... 55d3a52... M  b.
 905 :040000 040000 0ae5cac... 443c768... M  b
 906 :100644 100644 4268632... 55d3a52... M  ba
 907 EXPECT_END
 908
 909 test_expect_success \
 910     'L: verify internal tree sorting' \
 911         'git fast-import <input &&
 912          git diff-tree --abbrev --raw L^ L >output &&
 913          test_cmp expect output'
 914
 915 cat >input <<INPUT_END
 916 blob
 917 mark :1
 918 data <<EOF
 919 the data
 920 EOF
 921
 922 commit refs/heads/L2
 923 committer C O Mitter <committer@example.com> 1112912473 -0700
 924 data <<COMMIT
 925 init L2
 926 COMMIT
 927 M 644 :1 a/b/c
 928 M 644 :1 a/b/d
 929 M 644 :1 a/e/f
 930
 931 commit refs/heads/L2
 932 committer C O Mitter <committer@example.com> 1112912473 -0700
 933 data <<COMMIT
 934 update L2
 935 COMMIT
 936 C a g
 937 C a/e g/b
 938 M 644 :1 g/b/h
 939 INPUT_END
 940
 941 cat <<EOF >expect
 942 g/b/f
 943 g/b/h
 944 EOF
 945
 946 test_expect_success \
 947     'L: nested tree copy does not corrupt deltas' \
 948         'git fast-import <input &&
 949         git ls-tree L2 g/b/ >tmp &&
 950         cat tmp | cut -f 2 >actual &&
 951         test_cmp expect actual &&
 952         git fsck `git rev-parse L2`'
 953
 954 git update-ref -d refs/heads/L2
 955
 956 ###
 957 ### series M
 958 ###
 959
 960 test_tick
 961 cat >input <<INPUT_END
 962 commit refs/heads/M1
 963 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 964 data <<COMMIT
 965 file rename
 966 COMMIT
 967
 968 from refs/heads/branch^0
 969 R file2/newf file2/n.e.w.f
 970
 971 INPUT_END
 972
 973 cat >expect <<EOF
 974 :100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc R100   file2/newf      file2/n.e.w.f
 975 EOF
 976 test_expect_success \
 977         'M: rename file in same subdirectory' \
 978         'git fast-import <input &&
 979          git diff-tree -M -r M1^ M1 >actual &&
 980          compare_diff_raw expect actual'
 981
 982 cat >input <<INPUT_END
 983 commit refs/heads/M2
 984 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 985 data <<COMMIT
 986 file rename
 987 COMMIT
 988
 989 from refs/heads/branch^0
 990 R file2/newf i/am/new/to/you
 991
 992 INPUT_END
 993
 994 cat >expect <<EOF
 995 :100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc R100   file2/newf      i/am/new/to/you
 996 EOF
 997 test_expect_success \
 998         'M: rename file to new subdirectory' \
 999         'git fast-import <input &&
1000          git diff-tree -M -r M2^ M2 >actual &&
1001          compare_diff_raw expect actual'
1002
1003 cat >input <<INPUT_END
1004 commit refs/heads/M3
1005 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1006 data <<COMMIT
1007 file rename
1008 COMMIT
1009
1010 from refs/heads/M2^0
1011 R i other/sub
1012
1013 INPUT_END
1014
1015 cat >expect <<EOF
1016 :100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc R100   i/am/new/to/you other/sub/am/new/to/you
1017 EOF
1018 test_expect_success \
1019         'M: rename subdirectory to new subdirectory' \
1020         'git fast-import <input &&
1021          git diff-tree -M -r M3^ M3 >actual &&
1022          compare_diff_raw expect actual'
1023
1024 ###
1025 ### series N
1026 ###
1027
1028 test_tick
1029 cat >input <<INPUT_END
1030 commit refs/heads/N1
1031 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1032 data <<COMMIT
1033 file copy
1034 COMMIT
1035
1036 from refs/heads/branch^0
1037 C file2/newf file2/n.e.w.f
1038
1039 INPUT_END
1040
1041 cat >expect <<EOF
1042 :100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc C100   file2/newf      file2/n.e.w.f
1043 EOF
1044 test_expect_success \
1045         'N: copy file in same subdirectory' \
1046         'git fast-import <input &&
1047          git diff-tree -C --find-copies-harder -r N1^ N1 >actual &&
1048          compare_diff_raw expect actual'
1049
1050 cat >input <<INPUT_END
1051 commit refs/heads/N2
1052 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1053 data <<COMMIT
1054 clean directory copy
1055 COMMIT
1056
1057 from refs/heads/branch^0
1058 C file2 file3
1059
1060 commit refs/heads/N2
1061 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1062 data <<COMMIT
1063 modify directory copy
1064 COMMIT
1065
1066 M 644 inline file3/file5
1067 data <<EOF
1068 $file5_data
1069 EOF
1070
1071 INPUT_END
1072
1073 cat >expect <<EOF
1074 :100644 100644 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 C100   newdir/interesting      file3/file5
1075 :100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc C100   file2/newf      file3/newf
1076 :100644 100644 7123f7f44e39be127c5eb701e5968176ee9d78b1 7123f7f44e39be127c5eb701e5968176ee9d78b1 C100   file2/oldf      file3/oldf
1077 EOF
1078 test_expect_success \
1079         'N: copy then modify subdirectory' \
1080         'git fast-import <input &&
1081          git diff-tree -C --find-copies-harder -r N2^^ N2 >actual &&
1082          compare_diff_raw expect actual'
1083
1084 cat >input <<INPUT_END
1085 commit refs/heads/N3
1086 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1087 data <<COMMIT
1088 dirty directory copy
1089 COMMIT
1090
1091 from refs/heads/branch^0
1092 M 644 inline file2/file5
1093 data <<EOF
1094 $file5_data
1095 EOF
1096
1097 C file2 file3
1098 D file2/file5
1099
1100 INPUT_END
1101
1102 test_expect_success \
1103         'N: copy dirty subdirectory' \
1104         'git fast-import <input &&
1105          test `git rev-parse N2^{tree}` = `git rev-parse N3^{tree}`'
1106
1107 test_expect_success \
1108         'N: copy directory by id' \
1109         'cat >expect <<-\EOF &&
1110         :100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc C100   file2/newf      file3/newf
1111         :100644 100644 7123f7f44e39be127c5eb701e5968176ee9d78b1 7123f7f44e39be127c5eb701e5968176ee9d78b1 C100   file2/oldf      file3/oldf
1112         EOF
1113          subdir=$(git rev-parse refs/heads/branch^0:file2) &&
1114          cat >input <<-INPUT_END &&
1115         commit refs/heads/N4
1116         committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1117         data <<COMMIT
1118         copy by tree hash
1119         COMMIT
1120
1121         from refs/heads/branch^0
1122         M 040000 $subdir file3
1123         INPUT_END
1124          git fast-import <input &&
1125          git diff-tree -C --find-copies-harder -r N4^ N4 >actual &&
1126          compare_diff_raw expect actual'
1127
1128 test_expect_success PIPE 'N: read and copy directory' '
1129         cat >expect <<-\EOF
1130         :100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc C100   file2/newf      file3/newf
1131         :100644 100644 7123f7f44e39be127c5eb701e5968176ee9d78b1 7123f7f44e39be127c5eb701e5968176ee9d78b1 C100   file2/oldf      file3/oldf
1132         EOF
1133         git update-ref -d refs/heads/N4 &&
1134         rm -f backflow &&
1135         mkfifo backflow &&
1136         (
1137                 exec <backflow &&
1138                 cat <<-EOF &&
1139                 commit refs/heads/N4
1140                 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1141                 data <<COMMIT
1142                 copy by tree hash, part 2
1143                 COMMIT
1144
1145                 from refs/heads/branch^0
1146                 ls "file2"
1147                 EOF
1148                 read mode type tree filename &&
1149                 echo "M 040000 $tree file3"
1150         ) |
1151         git fast-import --cat-blob-fd=3 3>backflow &&
1152         git diff-tree -C --find-copies-harder -r N4^ N4 >actual &&
1153         compare_diff_raw expect actual
1154 '
1155
1156 test_expect_success PIPE 'N: empty directory reads as missing' '
1157         cat <<-\EOF >expect &&
1158         OBJNAME
1159         :000000 100644 OBJNAME OBJNAME A        unrelated
1160         EOF
1161         echo "missing src" >expect.response &&
1162         git update-ref -d refs/heads/read-empty &&
1163         rm -f backflow &&
1164         mkfifo backflow &&
1165         (
1166                 exec <backflow &&
1167                 cat <<-EOF &&
1168                 commit refs/heads/read-empty
1169                 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1170                 data <<COMMIT
1171                 read "empty" (missing) directory
1172                 COMMIT
1173
1174                 M 100644 inline src/greeting
1175                 data <<BLOB
1176                 hello
1177                 BLOB
1178                 C src/greeting dst1/non-greeting
1179                 C src/greeting unrelated
1180                 # leave behind "empty" src directory
1181                 D src/greeting
1182                 ls "src"
1183                 EOF
1184                 read -r line &&
1185                 printf "%s\n" "$line" >response &&
1186                 cat <<-\EOF
1187                 D dst1
1188                 D dst2
1189                 EOF
1190         ) |
1191         git fast-import --cat-blob-fd=3 3>backflow &&
1192         test_cmp expect.response response &&
1193         git rev-list read-empty |
1194         git diff-tree -r --root --stdin |
1195         sed "s/$_x40/OBJNAME/g" >actual &&
1196         test_cmp expect actual
1197 '
1198
1199 test_expect_success \
1200         'N: copy root directory by tree hash' \
1201         'cat >expect <<-\EOF &&
1202         :100755 000000 f1fb5da718392694d0076d677d6d0e364c79b0bc 0000000000000000000000000000000000000000 D      file3/newf
1203         :100644 000000 7123f7f44e39be127c5eb701e5968176ee9d78b1 0000000000000000000000000000000000000000 D      file3/oldf
1204         EOF
1205          root=$(git rev-parse refs/heads/branch^0^{tree}) &&
1206          cat >input <<-INPUT_END &&
1207         commit refs/heads/N6
1208         committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1209         data <<COMMIT
1210         copy root directory by tree hash
1211         COMMIT
1212
1213         from refs/heads/branch^0
1214         M 040000 $root ""
1215         INPUT_END
1216          git fast-import <input &&
1217          git diff-tree -C --find-copies-harder -r N4 N6 >actual &&
1218          compare_diff_raw expect actual'
1219
1220 test_expect_success \
1221         'N: delete directory by copying' \
1222         'cat >expect <<-\EOF &&
1223         OBJID
1224         :100644 000000 OBJID OBJID D    foo/bar/qux
1225         OBJID
1226         :000000 100644 OBJID OBJID A    foo/bar/baz
1227         :000000 100644 OBJID OBJID A    foo/bar/qux
1228         EOF
1229          empty_tree=$(git mktree </dev/null) &&
1230          cat >input <<-INPUT_END &&
1231         commit refs/heads/N-delete
1232         committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1233         data <<COMMIT
1234         collect data to be deleted
1235         COMMIT
1236
1237         deleteall
1238         M 100644 inline foo/bar/baz
1239         data <<DATA_END
1240         hello
1241         DATA_END
1242         C "foo/bar/baz" "foo/bar/qux"
1243         C "foo/bar/baz" "foo/bar/quux/1"
1244         C "foo/bar/baz" "foo/bar/quuux"
1245         M 040000 $empty_tree foo/bar/quux
1246         M 040000 $empty_tree foo/bar/quuux
1247
1248         commit refs/heads/N-delete
1249         committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1250         data <<COMMIT
1251         delete subdirectory
1252         COMMIT
1253
1254         M 040000 $empty_tree foo/bar/qux
1255         INPUT_END
1256          git fast-import <input &&
1257          git rev-list N-delete |
1258                 git diff-tree -r --stdin --root --always |
1259                 sed -e "s/$_x40/OBJID/g" >actual &&
1260          test_cmp expect actual'
1261
1262 test_expect_success \
1263         'N: modify copied tree' \
1264         'cat >expect <<-\EOF &&
1265         :100644 100644 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 C100   newdir/interesting      file3/file5
1266         :100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc C100   file2/newf      file3/newf
1267         :100644 100644 7123f7f44e39be127c5eb701e5968176ee9d78b1 7123f7f44e39be127c5eb701e5968176ee9d78b1 C100   file2/oldf      file3/oldf
1268         EOF
1269          subdir=$(git rev-parse refs/heads/branch^0:file2) &&
1270          cat >input <<-INPUT_END &&
1271         commit refs/heads/N5
1272         committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1273         data <<COMMIT
1274         copy by tree hash
1275         COMMIT
1276
1277         from refs/heads/branch^0
1278         M 040000 $subdir file3
1279
1280         commit refs/heads/N5
1281         committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1282         data <<COMMIT
1283         modify directory copy
1284         COMMIT
1285
1286         M 644 inline file3/file5
1287         data <<EOF
1288         $file5_data
1289         EOF
1290         INPUT_END
1291          git fast-import <input &&
1292          git diff-tree -C --find-copies-harder -r N5^^ N5 >actual &&
1293          compare_diff_raw expect actual'
1294
1295 test_expect_success \
1296         'N: reject foo/ syntax' \
1297         'subdir=$(git rev-parse refs/heads/branch^0:file2) &&
1298          test_must_fail git fast-import <<-INPUT_END
1299         commit refs/heads/N5B
1300         committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1301         data <<COMMIT
1302         copy with invalid syntax
1303         COMMIT
1304
1305         from refs/heads/branch^0
1306         M 040000 $subdir file3/
1307         INPUT_END'
1308
1309 test_expect_success \
1310         'N: reject foo/ syntax in copy source' \
1311         'test_must_fail git fast-import <<-INPUT_END
1312         commit refs/heads/N5C
1313         committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1314         data <<COMMIT
1315         copy with invalid syntax
1316         COMMIT
1317
1318         from refs/heads/branch^0
1319         C file2/ file3
1320         INPUT_END'
1321
1322 test_expect_success \
1323         'N: reject foo/ syntax in rename source' \
1324         'test_must_fail git fast-import <<-INPUT_END
1325         commit refs/heads/N5D
1326         committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1327         data <<COMMIT
1328         rename with invalid syntax
1329         COMMIT
1330
1331         from refs/heads/branch^0
1332         R file2/ file3
1333         INPUT_END'
1334
1335 test_expect_success \
1336         'N: reject foo/ syntax in ls argument' \
1337         'test_must_fail git fast-import <<-INPUT_END
1338         commit refs/heads/N5E
1339         committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1340         data <<COMMIT
1341         copy with invalid syntax
1342         COMMIT
1343
1344         from refs/heads/branch^0
1345         ls "file2/"
1346         INPUT_END'
1347
1348 test_expect_success \
1349         'N: copy to root by id and modify' \
1350         'echo "hello, world" >expect.foo &&
1351          echo hello >expect.bar &&
1352          git fast-import <<-SETUP_END &&
1353         commit refs/heads/N7
1354         committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1355         data <<COMMIT
1356         hello, tree
1357         COMMIT
1358
1359         deleteall
1360         M 644 inline foo/bar
1361         data <<EOF
1362         hello
1363         EOF
1364         SETUP_END
1365
1366          tree=$(git rev-parse --verify N7:) &&
1367          git fast-import <<-INPUT_END &&
1368         commit refs/heads/N8
1369         committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1370         data <<COMMIT
1371         copy to root by id and modify
1372         COMMIT
1373
1374         M 040000 $tree ""
1375         M 644 inline foo/foo
1376         data <<EOF
1377         hello, world
1378         EOF
1379         INPUT_END
1380          git show N8:foo/foo >actual.foo &&
1381          git show N8:foo/bar >actual.bar &&
1382          test_cmp expect.foo actual.foo &&
1383          test_cmp expect.bar actual.bar'
1384
1385 test_expect_success \
1386         'N: extract subtree' \
1387         'branch=$(git rev-parse --verify refs/heads/branch^{tree}) &&
1388          cat >input <<-INPUT_END &&
1389         commit refs/heads/N9
1390         committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1391         data <<COMMIT
1392         extract subtree branch:newdir
1393         COMMIT
1394
1395         M 040000 $branch ""
1396         C "newdir" ""
1397         INPUT_END
1398          git fast-import <input &&
1399          git diff --exit-code branch:newdir N9'
1400
1401 test_expect_success \
1402         'N: modify subtree, extract it, and modify again' \
1403         'echo hello >expect.baz &&
1404          echo hello, world >expect.qux &&
1405          git fast-import <<-SETUP_END &&
1406         commit refs/heads/N10
1407         committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1408         data <<COMMIT
1409         hello, tree
1410         COMMIT
1411
1412         deleteall
1413         M 644 inline foo/bar/baz
1414         data <<EOF
1415         hello
1416         EOF
1417         SETUP_END
1418
1419          tree=$(git rev-parse --verify N10:) &&
1420          git fast-import <<-INPUT_END &&
1421         commit refs/heads/N11
1422         committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1423         data <<COMMIT
1424         copy to root by id and modify
1425         COMMIT
1426
1427         M 040000 $tree ""
1428         M 100644 inline foo/bar/qux
1429         data <<EOF
1430         hello, world
1431         EOF
1432         R "foo" ""
1433         C "bar/qux" "bar/quux"
1434         INPUT_END
1435          git show N11:bar/baz >actual.baz &&
1436          git show N11:bar/qux >actual.qux &&
1437          git show N11:bar/quux >actual.quux &&
1438          test_cmp expect.baz actual.baz &&
1439          test_cmp expect.qux actual.qux &&
1440          test_cmp expect.qux actual.quux'
1441
1442 ###
1443 ### series O
1444 ###
1445
1446 cat >input <<INPUT_END
1447 #we will
1448 commit refs/heads/O1
1449 # -- ignore all of this text
1450 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1451 # $GIT_COMMITTER_NAME has inserted here for his benefit.
1452 data <<COMMIT
1453 dirty directory copy
1454 COMMIT
1455
1456 # don't forget the import blank line!
1457 #
1458 # yes, we started from our usual base of branch^0.
1459 # i like branch^0.
1460 from refs/heads/branch^0
1461 # and we need to reuse file2/file5 from N3 above.
1462 M 644 inline file2/file5
1463 # otherwise the tree will be different
1464 data <<EOF
1465 $file5_data
1466 EOF
1467
1468 # don't forget to copy file2 to file3
1469 C file2 file3
1470 #
1471 # or to delete file5 from file2.
1472 D file2/file5
1473 # are we done yet?
1474
1475 INPUT_END
1476
1477 test_expect_success \
1478         'O: comments are all skipped' \
1479         'git fast-import <input &&
1480          test `git rev-parse N3` = `git rev-parse O1`'
1481
1482 cat >input <<INPUT_END
1483 commit refs/heads/O2
1484 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1485 data <<COMMIT
1486 dirty directory copy
1487 COMMIT
1488 from refs/heads/branch^0
1489 M 644 inline file2/file5
1490 data <<EOF
1491 $file5_data
1492 EOF
1493 C file2 file3
1494 D file2/file5
1495
1496 INPUT_END
1497
1498 test_expect_success \
1499         'O: blank lines not necessary after data commands' \
1500         'git fast-import <input &&
1501          test `git rev-parse N3` = `git rev-parse O2`'
1502
1503 test_expect_success \
1504         'O: repack before next test' \
1505         'git repack -a -d'
1506
1507 cat >input <<INPUT_END
1508 commit refs/heads/O3
1509 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1510 data <<COMMIT
1511 zstring
1512 COMMIT
1513 commit refs/heads/O3
1514 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1515 data <<COMMIT
1516 zof
1517 COMMIT
1518 checkpoint
1519 commit refs/heads/O3
1520 mark :5
1521 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1522 data <<COMMIT
1523 zempty
1524 COMMIT
1525 checkpoint
1526 commit refs/heads/O3
1527 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1528 data <<COMMIT
1529 zcommits
1530 COMMIT
1531 reset refs/tags/O3-2nd
1532 from :5
1533 reset refs/tags/O3-3rd
1534 from :5
1535 INPUT_END
1536
1537 cat >expect <<INPUT_END
1538 string
1539 of
1540 empty
1541 commits
1542 INPUT_END
1543 test_expect_success \
1544         'O: blank lines not necessary after other commands' \
1545         'git fast-import <input &&
1546          test 8 = `find .git/objects/pack -type f | wc -l` &&
1547          test `git rev-parse refs/tags/O3-2nd` = `git rev-parse O3^` &&
1548          git log --reverse --pretty=oneline O3 | sed s/^.*z// >actual &&
1549          test_cmp expect actual'
1550
1551 cat >input <<INPUT_END
1552 commit refs/heads/O4
1553 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1554 data <<COMMIT
1555 zstring
1556 COMMIT
1557 commit refs/heads/O4
1558 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1559 data <<COMMIT
1560 zof
1561 COMMIT
1562 progress Two commits down, 2 to go!
1563 commit refs/heads/O4
1564 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1565 data <<COMMIT
1566 zempty
1567 COMMIT
1568 progress Three commits down, 1 to go!
1569 commit refs/heads/O4
1570 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1571 data <<COMMIT
1572 zcommits
1573 COMMIT
1574 progress I'm done!
1575 INPUT_END
1576 test_expect_success \
1577         'O: progress outputs as requested by input' \
1578         'git fast-import <input >actual &&
1579          grep "progress " <input >expect &&
1580          test_cmp expect actual'
1581
1582 ###
1583 ### series P (gitlinks)
1584 ###
1585
1586 cat >input <<INPUT_END
1587 blob
1588 mark :1
1589 data 10
1590 test file
1591
1592 reset refs/heads/sub
1593 commit refs/heads/sub
1594 mark :2
1595 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1596 data 12
1597 sub_initial
1598 M 100644 :1 file
1599
1600 blob
1601 mark :3
1602 data <<DATAEND
1603 [submodule "sub"]
1604         path = sub
1605         url = "`pwd`/sub"
1606 DATAEND
1607
1608 commit refs/heads/subuse1
1609 mark :4
1610 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1611 data 8
1612 initial
1613 from refs/heads/master
1614 M 100644 :3 .gitmodules
1615 M 160000 :2 sub
1616
1617 blob
1618 mark :5
1619 data 20
1620 test file
1621 more data
1622
1623 commit refs/heads/sub
1624 mark :6
1625 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1626 data 11
1627 sub_second
1628 from :2
1629 M 100644 :5 file
1630
1631 commit refs/heads/subuse1
1632 mark :7
1633 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1634 data 7
1635 second
1636 from :4
1637 M 160000 :6 sub
1638
1639 INPUT_END
1640
1641 test_expect_success \
1642         'P: supermodule & submodule mix' \
1643         'git fast-import <input &&
1644          git checkout subuse1 &&
1645          rm -rf sub && mkdir sub && (cd sub &&
1646          git init &&
1647          git fetch --update-head-ok .. refs/heads/sub:refs/heads/master &&
1648          git checkout master) &&
1649          git submodule init &&
1650          git submodule update'
1651
1652 SUBLAST=$(git rev-parse --verify sub)
1653 SUBPREV=$(git rev-parse --verify sub^)
1654
1655 cat >input <<INPUT_END
1656 blob
1657 mark :1
1658 data <<DATAEND
1659 [submodule "sub"]
1660         path = sub
1661         url = "`pwd`/sub"
1662 DATAEND
1663
1664 commit refs/heads/subuse2
1665 mark :2
1666 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1667 data 8
1668 initial
1669 from refs/heads/master
1670 M 100644 :1 .gitmodules
1671 M 160000 $SUBPREV sub
1672
1673 commit refs/heads/subuse2
1674 mark :3
1675 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1676 data 7
1677 second
1678 from :2
1679 M 160000 $SUBLAST sub
1680
1681 INPUT_END
1682
1683 test_expect_success \
1684         'P: verbatim SHA gitlinks' \
1685         'git branch -D sub &&
1686          git gc && git prune &&
1687          git fast-import <input &&
1688          test $(git rev-parse --verify subuse2) = $(git rev-parse --verify subuse1)'
1689
1690 test_tick
1691 cat >input <<INPUT_END
1692 commit refs/heads/subuse3
1693 mark :1
1694 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1695 data <<COMMIT
1696 corrupt
1697 COMMIT
1698
1699 from refs/heads/subuse2
1700 M 160000 inline sub
1701 data <<DATA
1702 $SUBPREV
1703 DATA
1704
1705 INPUT_END
1706
1707 test_expect_success 'P: fail on inline gitlink' '
1708     test_must_fail git fast-import <input'
1709
1710 test_tick
1711 cat >input <<INPUT_END
1712 blob
1713 mark :1
1714 data <<DATA
1715 $SUBPREV
1716 DATA
1717
1718 commit refs/heads/subuse3
1719 mark :2
1720 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1721 data <<COMMIT
1722 corrupt
1723 COMMIT
1724
1725 from refs/heads/subuse2
1726 M 160000 :1 sub
1727
1728 INPUT_END
1729
1730 test_expect_success 'P: fail on blob mark in gitlink' '
1731     test_must_fail git fast-import <input'
1732
1733 ###
1734 ### series Q (notes)
1735 ###
1736
1737 note1_data="The first note for the first commit"
1738 note2_data="The first note for the second commit"
1739 note3_data="The first note for the third commit"
1740 note1b_data="The second note for the first commit"
1741 note1c_data="The third note for the first commit"
1742 note2b_data="The second note for the second commit"
1743
1744 test_tick
1745 cat >input <<INPUT_END
1746 blob
1747 mark :2
1748 data <<EOF
1749 $file2_data
1750 EOF
1751
1752 commit refs/heads/notes-test
1753 mark :3
1754 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1755 data <<COMMIT
1756 first (:3)
1757 COMMIT
1758
1759 M 644 :2 file2
1760
1761 blob
1762 mark :4
1763 data $file4_len
1764 $file4_data
1765 commit refs/heads/notes-test
1766 mark :5
1767 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1768 data <<COMMIT
1769 second (:5)
1770 COMMIT
1771
1772 M 644 :4 file4
1773
1774 commit refs/heads/notes-test
1775 mark :6
1776 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1777 data <<COMMIT
1778 third (:6)
1779 COMMIT
1780
1781 M 644 inline file5
1782 data <<EOF
1783 $file5_data
1784 EOF
1785
1786 M 755 inline file6
1787 data <<EOF
1788 $file6_data
1789 EOF
1790
1791 blob
1792 mark :7
1793 data <<EOF
1794 $note1_data
1795 EOF
1796
1797 blob
1798 mark :8
1799 data <<EOF
1800 $note2_data
1801 EOF
1802
1803 commit refs/notes/foobar
1804 mark :9
1805 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1806 data <<COMMIT
1807 notes (:9)
1808 COMMIT
1809
1810 N :7 :3
1811 N :8 :5
1812 N inline :6
1813 data <<EOF
1814 $note3_data
1815 EOF
1816
1817 commit refs/notes/foobar
1818 mark :10
1819 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1820 data <<COMMIT
1821 notes (:10)
1822 COMMIT
1823
1824 N inline :3
1825 data <<EOF
1826 $note1b_data
1827 EOF
1828
1829 commit refs/notes/foobar2
1830 mark :11
1831 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1832 data <<COMMIT
1833 notes (:11)
1834 COMMIT
1835
1836 N inline :3
1837 data <<EOF
1838 $note1c_data
1839 EOF
1840
1841 commit refs/notes/foobar
1842 mark :12
1843 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1844 data <<COMMIT
1845 notes (:12)
1846 COMMIT
1847
1848 deleteall
1849 N inline :5
1850 data <<EOF
1851 $note2b_data
1852 EOF
1853
1854 INPUT_END
1855
1856 test_expect_success \
1857         'Q: commit notes' \
1858         'git fast-import <input &&
1859          git whatchanged notes-test'
1860 test_expect_success \
1861         'Q: verify pack' \
1862         'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'
1863
1864 commit1=$(git rev-parse notes-test~2)
1865 commit2=$(git rev-parse notes-test^)
1866 commit3=$(git rev-parse notes-test)
1867
1868 cat >expect <<EOF
1869 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1870 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1871
1872 first (:3)
1873 EOF
1874 test_expect_success \
1875         'Q: verify first commit' \
1876         'git cat-file commit notes-test~2 | sed 1d >actual &&
1877         test_cmp expect actual'
1878
1879 cat >expect <<EOF
1880 parent $commit1
1881 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1882 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1883
1884 second (:5)
1885 EOF
1886 test_expect_success \
1887         'Q: verify second commit' \
1888         'git cat-file commit notes-test^ | sed 1d >actual &&
1889         test_cmp expect actual'
1890
1891 cat >expect <<EOF
1892 parent $commit2
1893 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1894 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1895
1896 third (:6)
1897 EOF
1898 test_expect_success \
1899         'Q: verify third commit' \
1900         'git cat-file commit notes-test | sed 1d >actual &&
1901         test_cmp expect actual'
1902
1903 cat >expect <<EOF
1904 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1905 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1906
1907 notes (:9)
1908 EOF
1909 test_expect_success \
1910         'Q: verify first notes commit' \
1911         'git cat-file commit refs/notes/foobar~2 | sed 1d >actual &&
1912         test_cmp expect actual'
1913
1914 cat >expect.unsorted <<EOF
1915 100644 blob $commit1
1916 100644 blob $commit2
1917 100644 blob $commit3
1918 EOF
1919 cat expect.unsorted | sort >expect
1920 test_expect_success \
1921         'Q: verify first notes tree' \
1922         'git cat-file -p refs/notes/foobar~2^{tree} | sed "s/ [0-9a-f]* / /" >actual &&
1923          test_cmp expect actual'
1924
1925 echo "$note1_data" >expect
1926 test_expect_success \
1927         'Q: verify first note for first commit' \
1928         'git cat-file blob refs/notes/foobar~2:$commit1 >actual && test_cmp expect actual'
1929
1930 echo "$note2_data" >expect
1931 test_expect_success \
1932         'Q: verify first note for second commit' \
1933         'git cat-file blob refs/notes/foobar~2:$commit2 >actual && test_cmp expect actual'
1934
1935 echo "$note3_data" >expect
1936 test_expect_success \
1937         'Q: verify first note for third commit' \
1938         'git cat-file blob refs/notes/foobar~2:$commit3 >actual && test_cmp expect actual'
1939
1940 cat >expect <<EOF
1941 parent `git rev-parse --verify refs/notes/foobar~2`
1942 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1943 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1944
1945 notes (:10)
1946 EOF
1947 test_expect_success \
1948         'Q: verify second notes commit' \
1949         'git cat-file commit refs/notes/foobar^ | sed 1d >actual &&
1950         test_cmp expect actual'
1951
1952 cat >expect.unsorted <<EOF
1953 100644 blob $commit1
1954 100644 blob $commit2
1955 100644 blob $commit3
1956 EOF
1957 cat expect.unsorted | sort >expect
1958 test_expect_success \
1959         'Q: verify second notes tree' \
1960         'git cat-file -p refs/notes/foobar^^{tree} | sed "s/ [0-9a-f]*  / /" >actual &&
1961          test_cmp expect actual'
1962
1963 echo "$note1b_data" >expect
1964 test_expect_success \
1965         'Q: verify second note for first commit' \
1966         'git cat-file blob refs/notes/foobar^:$commit1 >actual && test_cmp expect actual'
1967
1968 echo "$note2_data" >expect
1969 test_expect_success \
1970         'Q: verify first note for second commit' \
1971         'git cat-file blob refs/notes/foobar^:$commit2 >actual && test_cmp expect actual'
1972
1973 echo "$note3_data" >expect
1974 test_expect_success \
1975         'Q: verify first note for third commit' \
1976         'git cat-file blob refs/notes/foobar^:$commit3 >actual && test_cmp expect actual'
1977
1978 cat >expect <<EOF
1979 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1980 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1981
1982 notes (:11)
1983 EOF
1984 test_expect_success \
1985         'Q: verify third notes commit' \
1986         'git cat-file commit refs/notes/foobar2 | sed 1d >actual &&
1987         test_cmp expect actual'
1988
1989 cat >expect.unsorted <<EOF
1990 100644 blob $commit1
1991 EOF
1992 cat expect.unsorted | sort >expect
1993 test_expect_success \
1994         'Q: verify third notes tree' \
1995         'git cat-file -p refs/notes/foobar2^{tree} | sed "s/ [0-9a-f]*  / /" >actual &&
1996          test_cmp expect actual'
1997
1998 echo "$note1c_data" >expect
1999 test_expect_success \
2000         'Q: verify third note for first commit' \
2001         'git cat-file blob refs/notes/foobar2:$commit1 >actual && test_cmp expect actual'
2002
2003 cat >expect <<EOF
2004 parent `git rev-parse --verify refs/notes/foobar^`
2005 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
2006 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
2007
2008 notes (:12)
2009 EOF
2010 test_expect_success \
2011         'Q: verify fourth notes commit' \
2012         'git cat-file commit refs/notes/foobar | sed 1d >actual &&
2013         test_cmp expect actual'
2014
2015 cat >expect.unsorted <<EOF
2016 100644 blob $commit2
2017 EOF
2018 cat expect.unsorted | sort >expect
2019 test_expect_success \
2020         'Q: verify fourth notes tree' \
2021         'git cat-file -p refs/notes/foobar^{tree} | sed "s/ [0-9a-f]*   / /" >actual &&
2022          test_cmp expect actual'
2023
2024 echo "$note2b_data" >expect
2025 test_expect_success \
2026         'Q: verify second note for second commit' \
2027         'git cat-file blob refs/notes/foobar:$commit2 >actual && test_cmp expect actual'
2028
2029 cat >input <<EOF
2030 reset refs/heads/Q0
2031
2032 commit refs/heads/note-Q0
2033 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
2034 data <<COMMIT
2035 Note for an empty branch.
2036 COMMIT
2037
2038 N inline refs/heads/Q0
2039 data <<NOTE
2040 some note
2041 NOTE
2042 EOF
2043 test_expect_success \
2044         'Q: deny note on empty branch' \
2045         'test_must_fail git fast-import <input'
2046 ###
2047 ### series R (feature and option)
2048 ###
2049
2050 cat >input <<EOF
2051 feature no-such-feature-exists
2052 EOF
2053
2054 test_expect_success 'R: abort on unsupported feature' '
2055         test_must_fail git fast-import <input
2056 '
2057
2058 cat >input <<EOF
2059 feature date-format=now
2060 EOF
2061
2062 test_expect_success 'R: supported feature is accepted' '
2063         git fast-import <input
2064 '
2065
2066 cat >input << EOF
2067 blob
2068 data 3
2069 hi
2070 feature date-format=now
2071 EOF
2072
2073 test_expect_success 'R: abort on receiving feature after data command' '
2074         test_must_fail git fast-import <input
2075 '
2076
2077 cat >input << EOF
2078 feature import-marks=git.marks
2079 feature import-marks=git2.marks
2080 EOF
2081
2082 test_expect_success 'R: only one import-marks feature allowed per stream' '
2083         test_must_fail git fast-import <input
2084 '
2085
2086 cat >input << EOF
2087 feature export-marks=git.marks
2088 blob
2089 mark :1
2090 data 3
2091 hi
2092
2093 EOF
2094
2095 test_expect_success \
2096     'R: export-marks feature results in a marks file being created' \
2097     'cat input | git fast-import &&
2098     grep :1 git.marks'
2099
2100 test_expect_success \
2101     'R: export-marks options can be overriden by commandline options' \
2102     'cat input | git fast-import --export-marks=other.marks &&
2103     grep :1 other.marks'
2104
2105 test_expect_success 'R: catch typo in marks file name' '
2106         test_must_fail git fast-import --import-marks=nonexistent.marks </dev/null &&
2107         echo "feature import-marks=nonexistent.marks" |
2108         test_must_fail git fast-import
2109 '
2110
2111 test_expect_success 'R: import and output marks can be the same file' '
2112         rm -f io.marks &&
2113         blob=$(echo hi | git hash-object --stdin) &&
2114         cat >expect <<-EOF &&
2115         :1 $blob
2116         :2 $blob
2117         EOF
2118         git fast-import --export-marks=io.marks <<-\EOF &&
2119         blob
2120         mark :1
2121         data 3
2122         hi
2123
2124         EOF
2125         git fast-import --import-marks=io.marks --export-marks=io.marks <<-\EOF &&
2126         blob
2127         mark :2
2128         data 3
2129         hi
2130
2131         EOF
2132         test_cmp expect io.marks
2133 '
2134
2135 test_expect_success 'R: --import-marks=foo --output-marks=foo to create foo fails' '
2136         rm -f io.marks &&
2137         test_must_fail git fast-import --import-marks=io.marks --export-marks=io.marks <<-\EOF
2138         blob
2139         mark :1
2140         data 3
2141         hi
2142
2143         EOF
2144 '
2145
2146 test_expect_success 'R: --import-marks-if-exists' '
2147         rm -f io.marks &&
2148         blob=$(echo hi | git hash-object --stdin) &&
2149         echo ":1 $blob" >expect &&
2150         git fast-import --import-marks-if-exists=io.marks --export-marks=io.marks <<-\EOF &&
2151         blob
2152         mark :1
2153         data 3
2154         hi
2155
2156         EOF
2157         test_cmp expect io.marks
2158 '
2159
2160 test_expect_success 'R: feature import-marks-if-exists' '
2161         rm -f io.marks &&
2162         >expect &&
2163
2164         git fast-import --export-marks=io.marks <<-\EOF &&
2165         feature import-marks-if-exists=not_io.marks
2166         EOF
2167         test_cmp expect io.marks &&
2168
2169         blob=$(echo hi | git hash-object --stdin) &&
2170
2171         echo ":1 $blob" >io.marks &&
2172         echo ":1 $blob" >expect &&
2173         echo ":2 $blob" >>expect &&
2174
2175         git fast-import --export-marks=io.marks <<-\EOF &&
2176         feature import-marks-if-exists=io.marks
2177         blob
2178         mark :2
2179         data 3
2180         hi
2181
2182         EOF
2183         test_cmp expect io.marks &&
2184
2185         echo ":3 $blob" >>expect &&
2186
2187         git fast-import --import-marks=io.marks \
2188                         --export-marks=io.marks <<-\EOF &&
2189         feature import-marks-if-exists=not_io.marks
2190         blob
2191         mark :3
2192         data 3
2193         hi
2194
2195         EOF
2196         test_cmp expect io.marks &&
2197
2198         >expect &&
2199
2200         git fast-import --import-marks-if-exists=not_io.marks \
2201                         --export-marks=io.marks <<-\EOF
2202         feature import-marks-if-exists=io.marks
2203         EOF
2204         test_cmp expect io.marks
2205 '
2206
2207 cat >input << EOF
2208 feature import-marks=marks.out
2209 feature export-marks=marks.new
2210 EOF
2211
2212 test_expect_success \
2213     'R: import to output marks works without any content' \
2214     'cat input | git fast-import &&
2215     test_cmp marks.out marks.new'
2216
2217 cat >input <<EOF
2218 feature import-marks=nonexistent.marks
2219 feature export-marks=marks.new
2220 EOF
2221
2222 test_expect_success \
2223     'R: import marks prefers commandline marks file over the stream' \
2224     'cat input | git fast-import --import-marks=marks.out &&
2225     test_cmp marks.out marks.new'
2226
2227
2228 cat >input <<EOF
2229 feature import-marks=nonexistent.marks
2230 feature export-marks=combined.marks
2231 EOF
2232
2233 test_expect_success 'R: multiple --import-marks= should be honoured' '
2234     head -n2 marks.out > one.marks &&
2235     tail -n +3 marks.out > two.marks &&
2236     git fast-import --import-marks=one.marks --import-marks=two.marks <input &&
2237     test_cmp marks.out combined.marks
2238 '
2239
2240 cat >input <<EOF
2241 feature relative-marks
2242 feature import-marks=relative.in
2243 feature export-marks=relative.out
2244 EOF
2245
2246 test_expect_success 'R: feature relative-marks should be honoured' '
2247     mkdir -p .git/info/fast-import/ &&
2248     cp marks.new .git/info/fast-import/relative.in &&
2249     git fast-import <input &&
2250     test_cmp marks.new .git/info/fast-import/relative.out
2251 '
2252
2253 cat >input <<EOF
2254 feature relative-marks
2255 feature import-marks=relative.in
2256 feature no-relative-marks
2257 feature export-marks=non-relative.out
2258 EOF
2259
2260 test_expect_success 'R: feature no-relative-marks should be honoured' '
2261     git fast-import <input &&
2262     test_cmp marks.new non-relative.out
2263 '
2264
2265 test_expect_success 'R: feature ls supported' '
2266         echo "feature ls" |
2267         git fast-import
2268 '
2269
2270 test_expect_success 'R: feature cat-blob supported' '
2271         echo "feature cat-blob" |
2272         git fast-import
2273 '
2274
2275 test_expect_success 'R: cat-blob-fd must be a nonnegative integer' '
2276         test_must_fail git fast-import --cat-blob-fd=-1 </dev/null
2277 '
2278
2279 test_expect_success NOT_MINGW 'R: print old blob' '
2280         blob=$(echo "yes it can" | git hash-object -w --stdin) &&
2281         cat >expect <<-EOF &&
2282         ${blob} blob 11
2283         yes it can
2284
2285         EOF
2286         echo "cat-blob $blob" |
2287         git fast-import --cat-blob-fd=6 6>actual &&
2288         test_cmp expect actual
2289 '
2290
2291 test_expect_success NOT_MINGW 'R: in-stream cat-blob-fd not respected' '
2292         echo hello >greeting &&
2293         blob=$(git hash-object -w greeting) &&
2294         cat >expect <<-EOF &&
2295         ${blob} blob 6
2296         hello
2297
2298         EOF
2299         git fast-import --cat-blob-fd=3 3>actual.3 >actual.1 <<-EOF &&
2300         cat-blob $blob
2301         EOF
2302         test_cmp expect actual.3 &&
2303         test_cmp empty actual.1 &&
2304         git fast-import 3>actual.3 >actual.1 <<-EOF &&
2305         option cat-blob-fd=3
2306         cat-blob $blob
2307         EOF
2308         test_cmp empty actual.3 &&
2309         test_cmp expect actual.1
2310 '
2311
2312 test_expect_success NOT_MINGW 'R: print new blob' '
2313         blob=$(echo "yep yep yep" | git hash-object --stdin) &&
2314         cat >expect <<-EOF &&
2315         ${blob} blob 12
2316         yep yep yep
2317
2318         EOF
2319         git fast-import --cat-blob-fd=6 6>actual <<-\EOF &&
2320         blob
2321         mark :1
2322         data <<BLOB_END
2323         yep yep yep
2324         BLOB_END
2325         cat-blob :1
2326         EOF
2327         test_cmp expect actual
2328 '
2329
2330 test_expect_success NOT_MINGW 'R: print new blob by sha1' '
2331         blob=$(echo "a new blob named by sha1" | git hash-object --stdin) &&
2332         cat >expect <<-EOF &&
2333         ${blob} blob 25
2334         a new blob named by sha1
2335
2336         EOF
2337         git fast-import --cat-blob-fd=6 6>actual <<-EOF &&
2338         blob
2339         data <<BLOB_END
2340         a new blob named by sha1
2341         BLOB_END
2342         cat-blob $blob
2343         EOF
2344         test_cmp expect actual
2345 '
2346
2347 test_expect_success 'setup: big file' '
2348         (
2349                 echo "the quick brown fox jumps over the lazy dog" >big &&
2350                 for i in 1 2 3
2351                 do
2352                         cat big big big big >bigger &&
2353                         cat bigger bigger bigger bigger >big ||
2354                         exit
2355                 done
2356         )
2357 '
2358
2359 test_expect_success 'R: print two blobs to stdout' '
2360         blob1=$(git hash-object big) &&
2361         blob1_len=$(wc -c <big) &&
2362         blob2=$(echo hello | git hash-object --stdin) &&
2363         {
2364                 echo ${blob1} blob $blob1_len &&
2365                 cat big &&
2366                 cat <<-EOF
2367
2368                 ${blob2} blob 6
2369                 hello
2370
2371                 EOF
2372         } >expect &&
2373         {
2374                 cat <<-\END_PART1 &&
2375                         blob
2376                         mark :1
2377                         data <<data_end
2378                 END_PART1
2379                 cat big &&
2380                 cat <<-\EOF
2381                         data_end
2382                         blob
2383                         mark :2
2384                         data <<data_end
2385                         hello
2386                         data_end
2387                         cat-blob :1
2388                         cat-blob :2
2389                 EOF
2390         } |
2391         git fast-import >actual &&
2392         test_cmp expect actual
2393 '
2394
2395 test_expect_success PIPE 'R: copy using cat-file' '
2396         expect_id=$(git hash-object big) &&
2397         expect_len=$(wc -c <big) &&
2398         echo $expect_id blob $expect_len >expect.response &&
2399
2400         rm -f blobs &&
2401         cat >frontend <<-\FRONTEND_END &&
2402         #!/bin/sh
2403         FRONTEND_END
2404
2405         mkfifo blobs &&
2406         (
2407                 export GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL GIT_COMMITTER_DATE &&
2408                 cat <<-\EOF &&
2409                 feature cat-blob
2410                 blob
2411                 mark :1
2412                 data <<BLOB
2413                 EOF
2414                 cat big &&
2415                 cat <<-\EOF &&
2416                 BLOB
2417                 cat-blob :1
2418                 EOF
2419
2420                 read blob_id type size <&3 &&
2421                 echo "$blob_id $type $size" >response &&
2422                 head_c $size >blob <&3 &&
2423                 read newline <&3 &&
2424
2425                 cat <<-EOF &&
2426                 commit refs/heads/copied
2427                 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
2428                 data <<COMMIT
2429                 copy big file as file3
2430                 COMMIT
2431                 M 644 inline file3
2432                 data <<BLOB
2433                 EOF
2434                 cat blob &&
2435                 echo BLOB
2436         ) 3<blobs |
2437         git fast-import --cat-blob-fd=3 3>blobs &&
2438         git show copied:file3 >actual &&
2439         test_cmp expect.response response &&
2440         test_cmp big actual
2441 '
2442
2443 test_expect_success PIPE 'R: print blob mid-commit' '
2444         rm -f blobs &&
2445         echo "A blob from _before_ the commit." >expect &&
2446         mkfifo blobs &&
2447         (
2448                 exec 3<blobs &&
2449                 cat <<-EOF &&
2450                 feature cat-blob
2451                 blob
2452                 mark :1
2453                 data <<BLOB
2454                 A blob from _before_ the commit.
2455                 BLOB
2456                 commit refs/heads/temporary
2457                 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
2458                 data <<COMMIT
2459                 Empty commit
2460                 COMMIT
2461                 cat-blob :1
2462                 EOF
2463
2464                 read blob_id type size <&3 &&
2465                 head_c $size >actual <&3 &&
2466                 read newline <&3 &&
2467
2468                 echo
2469         ) |
2470         git fast-import --cat-blob-fd=3 3>blobs &&
2471         test_cmp expect actual
2472 '
2473
2474 test_expect_success PIPE 'R: print staged blob within commit' '
2475         rm -f blobs &&
2476         echo "A blob from _within_ the commit." >expect &&
2477         mkfifo blobs &&
2478         (
2479                 exec 3<blobs &&
2480                 cat <<-EOF &&
2481                 feature cat-blob
2482                 commit refs/heads/within
2483                 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
2484                 data <<COMMIT
2485                 Empty commit
2486                 COMMIT
2487                 M 644 inline within
2488                 data <<BLOB
2489                 A blob from _within_ the commit.
2490                 BLOB
2491                 EOF
2492
2493                 to_get=$(
2494                         echo "A blob from _within_ the commit." |
2495                         git hash-object --stdin
2496                 ) &&
2497                 echo "cat-blob $to_get" &&
2498
2499                 read blob_id type size <&3 &&
2500                 head_c $size >actual <&3 &&
2501                 read newline <&3 &&
2502
2503                 echo deleteall
2504         ) |
2505         git fast-import --cat-blob-fd=3 3>blobs &&
2506         test_cmp expect actual
2507 '
2508
2509 cat >input << EOF
2510 option git quiet
2511 blob
2512 data 3
2513 hi
2514
2515 EOF
2516
2517 test_expect_success 'R: quiet option results in no stats being output' '
2518     cat input | git fast-import 2> output &&
2519     test_cmp empty output
2520 '
2521
2522 test_expect_success 'R: feature done means terminating "done" is mandatory' '
2523         echo feature done | test_must_fail git fast-import &&
2524         test_must_fail git fast-import --done </dev/null
2525 '
2526
2527 test_expect_success 'R: terminating "done" with trailing gibberish is ok' '
2528         git fast-import <<-\EOF &&
2529         feature done
2530         done
2531         trailing gibberish
2532         EOF
2533         git fast-import <<-\EOF
2534         done
2535         more trailing gibberish
2536         EOF
2537 '
2538
2539 test_expect_success 'R: terminating "done" within commit' '
2540         cat >expect <<-\EOF &&
2541         OBJID
2542         :000000 100644 OBJID OBJID A    hello.c
2543         :000000 100644 OBJID OBJID A    hello2.c
2544         EOF
2545         git fast-import <<-EOF &&
2546         commit refs/heads/done-ends
2547         committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
2548         data <<EOT
2549         Commit terminated by "done" command
2550         EOT
2551         M 100644 inline hello.c
2552         data <<EOT
2553         Hello, world.
2554         EOT
2555         C hello.c hello2.c
2556         done
2557         EOF
2558         git rev-list done-ends |
2559         git diff-tree -r --stdin --root --always |
2560         sed -e "s/$_x40/OBJID/g" >actual &&
2561         test_cmp expect actual
2562 '
2563
2564 cat >input <<EOF
2565 option git non-existing-option
2566 EOF
2567
2568 test_expect_success 'R: die on unknown option' '
2569     test_must_fail git fast-import <input
2570 '
2571
2572 test_expect_success 'R: unknown commandline options are rejected' '\
2573     test_must_fail git fast-import --non-existing-option < /dev/null
2574 '
2575
2576 test_expect_success 'R: die on invalid option argument' '
2577         echo "option git active-branches=-5" |
2578         test_must_fail git fast-import &&
2579         echo "option git depth=" |
2580         test_must_fail git fast-import &&
2581         test_must_fail git fast-import --depth="5 elephants" </dev/null
2582 '
2583
2584 cat >input <<EOF
2585 option non-existing-vcs non-existing-option
2586 EOF
2587
2588 test_expect_success 'R: ignore non-git options' '
2589     git fast-import <input
2590 '
2591
2592 ##
2593 ## R: very large blobs
2594 ##
2595 blobsize=$((2*1024*1024 + 53))
2596 test-genrandom bar $blobsize >expect
2597 cat >input <<INPUT_END
2598 commit refs/heads/big-file
2599 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
2600 data <<COMMIT
2601 R - big file
2602 COMMIT
2603
2604 M 644 inline big1
2605 data $blobsize
2606 INPUT_END
2607 cat expect >>input
2608 cat >>input <<INPUT_END
2609 M 644 inline big2
2610 data $blobsize
2611 INPUT_END
2612 cat expect >>input
2613 echo >>input
2614
2615 test_expect_success \
2616         'R: blob bigger than threshold' \
2617         'test_create_repo R &&
2618          git --git-dir=R/.git fast-import --big-file-threshold=1 <input'
2619 test_expect_success \
2620         'R: verify created pack' \
2621         ': >verify &&
2622          for p in R/.git/objects/pack/*.pack;
2623          do
2624            git verify-pack -v $p >>verify || exit;
2625          done'
2626 test_expect_success \
2627         'R: verify written objects' \
2628         'git --git-dir=R/.git cat-file blob big-file:big1 >actual &&
2629          test_cmp expect actual &&
2630          a=$(git --git-dir=R/.git rev-parse big-file:big1) &&
2631          b=$(git --git-dir=R/.git rev-parse big-file:big2) &&
2632          test $a = $b'
2633 test_expect_success \
2634         'R: blob appears only once' \
2635         'n=$(grep $a verify | wc -l) &&
2636          test 1 = $n'
2637
2638 ###
2639 ### series S
2640 ###
2641 #
2642 # Make sure missing spaces and EOLs after mark references
2643 # cause errors.
2644 #
2645 # Setup:
2646 #
2647 #   1--2--4
2648 #    \   /
2649 #     -3-
2650 #
2651 #   commit marks:  301, 302, 303, 304
2652 #   blob marks:              403, 404, resp.
2653 #   note mark:          202
2654 #
2655 # The error message when a space is missing not at the
2656 # end of the line is:
2657 #
2658 #   Missing space after ..
2659 #
2660 # or when extra characters come after the mark at the end
2661 # of the line:
2662 #
2663 #   Garbage after ..
2664 #
2665 # or when the dataref is neither "inline " or a known SHA1,
2666 #
2667 #   Invalid dataref ..
2668 #
2669 test_tick
2670
2671 cat >input <<INPUT_END
2672 commit refs/heads/S
2673 mark :301
2674 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
2675 data <<COMMIT
2676 commit 1
2677 COMMIT
2678 M 100644 inline hello.c
2679 data <<BLOB
2680 blob 1
2681 BLOB
2682
2683 commit refs/heads/S
2684 mark :302
2685 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
2686 data <<COMMIT
2687 commit 2
2688 COMMIT
2689 from :301
2690 M 100644 inline hello.c
2691 data <<BLOB
2692 blob 2
2693 BLOB
2694
2695 blob
2696 mark :403
2697 data <<BLOB
2698 blob 3
2699 BLOB
2700
2701 blob
2702 mark :202
2703 data <<BLOB
2704 note 2
2705 BLOB
2706 INPUT_END
2707
2708 test_expect_success 'S: initialize for S tests' '
2709         git fast-import --export-marks=marks <input
2710 '
2711
2712 #
2713 # filemodify, three datarefs
2714 #
2715 test_expect_success 'S: filemodify with garbage after mark must fail' '
2716         test_must_fail git fast-import --import-marks=marks <<-EOF 2>err &&
2717         commit refs/heads/S
2718         committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
2719         data <<COMMIT
2720         commit N
2721         COMMIT
2722         M 100644 :403x hello.c
2723         EOF
2724         cat err &&
2725         test_i18ngrep "space after mark" err
2726 '
2727
2728 # inline is misspelled; fast-import thinks it is some unknown dataref
2729 test_expect_success 'S: filemodify with garbage after inline must fail' '
2730         test_must_fail git fast-import --import-marks=marks <<-EOF 2>err &&
2731         commit refs/heads/S
2732         committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
2733         data <<COMMIT
2734         commit N
2735         COMMIT
2736         M 100644 inlineX hello.c
2737         data <<BLOB
2738         inline
2739         BLOB
2740         EOF
2741         cat err &&
2742         test_i18ngrep "nvalid dataref" err
2743 '
2744
2745 test_expect_success 'S: filemodify with garbage after sha1 must fail' '
2746         sha1=$(grep :403 marks | cut -d\  -f2) &&
2747         test_must_fail git fast-import --import-marks=marks <<-EOF 2>err &&
2748         commit refs/heads/S
2749         committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
2750         data <<COMMIT
2751         commit N
2752         COMMIT
2753         M 100644 ${sha1}x hello.c
2754         EOF
2755         cat err &&
2756         test_i18ngrep "space after SHA1" err
2757 '
2758
2759 #
2760 # notemodify, three ways to say dataref
2761 #
2762 test_expect_success 'S: notemodify with garabge after mark dataref must fail' '
2763         test_must_fail git fast-import --import-marks=marks <<-EOF 2>err &&
2764         commit refs/heads/S
2765         committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
2766         data <<COMMIT
2767         commit S note dataref markref
2768         COMMIT
2769         N :202x :302
2770         EOF
2771         cat err &&
2772         test_i18ngrep "space after mark" err
2773 '
2774
2775 test_expect_success 'S: notemodify with garbage after inline dataref must fail' '
2776         test_must_fail git fast-import --import-marks=marks <<-EOF 2>err &&
2777         commit refs/heads/S
2778         committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
2779         data <<COMMIT
2780         commit S note dataref inline
2781         COMMIT
2782         N inlineX :302
2783         data <<BLOB
2784         note blob
2785         BLOB
2786         EOF
2787         cat err &&
2788         test_i18ngrep "nvalid dataref" err
2789 '
2790
2791 test_expect_success 'S: notemodify with garbage after sha1 dataref must fail' '
2792         sha1=$(grep :202 marks | cut -d\  -f2) &&
2793         test_must_fail git fast-import --import-marks=marks <<-EOF 2>err &&
2794         commit refs/heads/S
2795         committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
2796         data <<COMMIT
2797         commit S note dataref sha1
2798         COMMIT
2799         N ${sha1}x :302
2800         EOF
2801         cat err &&
2802         test_i18ngrep "space after SHA1" err
2803 '
2804
2805 #
2806 # notemodify, mark in committish
2807 #
2808 test_expect_success 'S: notemodify with garbarge after mark committish must fail' '
2809         test_must_fail git fast-import --import-marks=marks <<-EOF 2>err &&
2810         commit refs/heads/Snotes
2811         committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
2812         data <<COMMIT
2813         commit S note committish
2814         COMMIT
2815         N :202 :302x
2816         EOF
2817         cat err &&
2818         test_i18ngrep "after mark" err
2819 '
2820
2821 #
2822 # from
2823 #
2824 test_expect_success 'S: from with garbage after mark must fail' '
2825         # no &&
2826         git fast-import --import-marks=marks --export-marks=marks <<-EOF 2>err
2827         commit refs/heads/S2
2828         mark :303
2829         committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
2830         data <<COMMIT
2831         commit 3
2832         COMMIT
2833         from :301x
2834         M 100644 :403 hello.c
2835         EOF
2836
2837         ret=$? &&
2838         echo returned $ret &&
2839         test $ret -ne 0 && # failed, but it created the commit
2840
2841         # go create the commit, need it for merge test
2842         git fast-import --import-marks=marks --export-marks=marks <<-EOF &&
2843         commit refs/heads/S2
2844         mark :303
2845         committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
2846         data <<COMMIT
2847         commit 3
2848         COMMIT
2849         from :301
2850         M 100644 :403 hello.c
2851         EOF
2852
2853         # now evaluate the error
2854         cat err &&
2855         test_i18ngrep "after mark" err
2856 '
2857
2858
2859 #
2860 # merge
2861 #
2862 test_expect_success 'S: merge with garbage after mark must fail' '
2863         test_must_fail git fast-import --import-marks=marks <<-EOF 2>err &&
2864         commit refs/heads/S
2865         mark :304
2866         committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
2867         data <<COMMIT
2868         merge 4
2869         COMMIT
2870         from :302
2871         merge :303x
2872         M 100644 :403 hello.c
2873         EOF
2874         cat err &&
2875         test_i18ngrep "after mark" err
2876 '
2877
2878 #
2879 # tag, from markref
2880 #
2881 test_expect_success 'S: tag with garbage after mark must fail' '
2882         test_must_fail git fast-import --import-marks=marks <<-EOF 2>err &&
2883         tag refs/tags/Stag
2884         from :302x
2885         tagger $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
2886         data <<TAG
2887         tag S
2888         TAG
2889         EOF
2890         cat err &&
2891         test_i18ngrep "after mark" err
2892 '
2893
2894 #
2895 # cat-blob markref
2896 #
2897 test_expect_success 'S: cat-blob with garbage after mark must fail' '
2898         test_must_fail git fast-import --import-marks=marks <<-EOF 2>err &&
2899         cat-blob :403x
2900         EOF
2901         cat err &&
2902         test_i18ngrep "after mark" err
2903 '
2904
2905 #
2906 # ls markref
2907 #
2908 test_expect_success 'S: ls with garbage after mark must fail' '
2909         test_must_fail git fast-import --import-marks=marks <<-EOF 2>err &&
2910         ls :302x hello.c
2911         EOF
2912         cat err &&
2913         test_i18ngrep "space after mark" err
2914 '
2915
2916 test_expect_success 'S: ls with garbage after sha1 must fail' '
2917         sha1=$(grep :302 marks | cut -d\  -f2) &&
2918         test_must_fail git fast-import --import-marks=marks <<-EOF 2>err &&
2919         ls ${sha1}x hello.c
2920         EOF
2921         cat err &&
2922         test_i18ngrep "space after tree-ish" err
2923 '
2924
2925 test_done