2007-01-18 19:26:24 +01:00
|
|
|
#!/bin/sh
|
|
|
|
#
|
|
|
|
# Copyright (c) 2007 Shawn Pearce
|
|
|
|
#
|
|
|
|
|
|
|
|
test_description='test git-fast-import utility'
|
|
|
|
. ./test-lib.sh
|
|
|
|
. ../diff-lib.sh ;# test-lib chdir's into trash
|
|
|
|
|
2007-01-18 20:49:05 +01:00
|
|
|
file2_data='file2
|
|
|
|
second line of EOF'
|
|
|
|
|
|
|
|
file3_data='EOF
|
|
|
|
in 3rd file
|
|
|
|
END'
|
|
|
|
|
|
|
|
file4_data=abcd
|
|
|
|
file4_len=4
|
|
|
|
|
2007-01-18 21:17:58 +01:00
|
|
|
file5_data='an inline file.
|
|
|
|
we should see it later.'
|
|
|
|
|
|
|
|
file6_data='#!/bin/sh
|
|
|
|
echo "$@"'
|
|
|
|
|
2007-01-18 19:26:24 +01:00
|
|
|
###
|
|
|
|
### series A
|
|
|
|
###
|
|
|
|
|
|
|
|
test_tick
|
|
|
|
cat >input <<INPUT_END
|
|
|
|
blob
|
|
|
|
mark :2
|
|
|
|
data <<EOF
|
2007-01-18 20:49:05 +01:00
|
|
|
$file2_data
|
2007-01-18 19:26:24 +01:00
|
|
|
EOF
|
|
|
|
|
|
|
|
blob
|
|
|
|
mark :3
|
|
|
|
data <<END
|
2007-01-18 20:49:05 +01:00
|
|
|
$file3_data
|
2007-01-18 19:26:24 +01:00
|
|
|
END
|
|
|
|
|
|
|
|
blob
|
|
|
|
mark :4
|
2007-01-18 20:49:05 +01:00
|
|
|
data $file4_len
|
|
|
|
$file4_data
|
2007-01-18 19:26:24 +01:00
|
|
|
commit refs/heads/master
|
|
|
|
mark :5
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
initial
|
|
|
|
COMMIT
|
|
|
|
|
|
|
|
M 644 :2 file2
|
|
|
|
M 644 :3 file3
|
|
|
|
M 755 :4 file4
|
|
|
|
|
|
|
|
INPUT_END
|
|
|
|
test_expect_success \
|
|
|
|
'A: create pack from stdin' \
|
|
|
|
'git-fast-import --export-marks=marks.out <input &&
|
|
|
|
git-whatchanged master'
|
|
|
|
test_expect_success \
|
|
|
|
'A: verify pack' \
|
|
|
|
'for p in .git/objects/pack/*.pack;do git-verify-pack $p||exit;done'
|
|
|
|
|
|
|
|
cat >expect <<EOF
|
|
|
|
author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
|
|
|
|
initial
|
|
|
|
EOF
|
|
|
|
test_expect_success \
|
|
|
|
'A: verify commit' \
|
|
|
|
'git-cat-file commit master | sed 1d >actual &&
|
|
|
|
diff -u expect actual'
|
|
|
|
|
|
|
|
cat >expect <<EOF
|
|
|
|
100644 blob file2
|
|
|
|
100644 blob file3
|
|
|
|
100755 blob file4
|
|
|
|
EOF
|
|
|
|
test_expect_success \
|
|
|
|
'A: verify tree' \
|
|
|
|
'git-cat-file -p master^{tree} | sed "s/ [0-9a-f]* / /" >actual &&
|
|
|
|
diff -u expect actual'
|
|
|
|
|
2007-01-18 20:49:05 +01:00
|
|
|
echo "$file2_data" >expect
|
2007-01-18 19:26:24 +01:00
|
|
|
test_expect_success \
|
|
|
|
'A: verify file2' \
|
|
|
|
'git-cat-file blob master:file2 >actual && diff -u expect actual'
|
|
|
|
|
2007-01-18 20:49:05 +01:00
|
|
|
echo "$file3_data" >expect
|
2007-01-18 19:26:24 +01:00
|
|
|
test_expect_success \
|
|
|
|
'A: verify file3' \
|
|
|
|
'git-cat-file blob master:file3 >actual && diff -u expect actual'
|
|
|
|
|
2007-01-18 20:49:05 +01:00
|
|
|
printf "$file4_data" >expect
|
2007-01-18 19:26:24 +01:00
|
|
|
test_expect_success \
|
|
|
|
'A: verify file4' \
|
|
|
|
'git-cat-file blob master:file4 >actual && diff -u expect actual'
|
|
|
|
|
|
|
|
cat >expect <<EOF
|
|
|
|
:2 `git-rev-parse --verify master:file2`
|
|
|
|
:3 `git-rev-parse --verify master:file3`
|
|
|
|
:4 `git-rev-parse --verify master:file4`
|
|
|
|
:5 `git-rev-parse --verify master^0`
|
|
|
|
EOF
|
|
|
|
test_expect_success \
|
|
|
|
'A: verify marks output' \
|
|
|
|
'diff -u expect marks.out'
|
|
|
|
|
|
|
|
###
|
|
|
|
### series B
|
|
|
|
###
|
|
|
|
|
|
|
|
test_tick
|
|
|
|
cat >input <<INPUT_END
|
|
|
|
commit refs/heads/branch
|
|
|
|
mark :1
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
corrupt
|
|
|
|
COMMIT
|
|
|
|
|
|
|
|
from refs/heads/master
|
|
|
|
M 755 0000000000000000000000000000000000000001 zero1
|
|
|
|
|
|
|
|
INPUT_END
|
|
|
|
test_expect_failure \
|
|
|
|
'B: fail on invalid blob sha1' \
|
|
|
|
'git-fast-import <input'
|
|
|
|
rm -f .git/objects/pack_* .git/objects/index_*
|
|
|
|
|
|
|
|
###
|
|
|
|
### series C
|
|
|
|
###
|
|
|
|
|
|
|
|
newf=`echo hi newf | git-hash-object -w --stdin`
|
|
|
|
oldf=`git-rev-parse --verify master:file2`
|
|
|
|
test_tick
|
|
|
|
cat >input <<INPUT_END
|
|
|
|
commit refs/heads/branch
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
second
|
|
|
|
COMMIT
|
|
|
|
|
|
|
|
from refs/heads/master
|
|
|
|
M 644 $oldf file2/oldf
|
|
|
|
M 755 $newf file2/newf
|
|
|
|
D file3
|
|
|
|
|
|
|
|
INPUT_END
|
|
|
|
test_expect_success \
|
|
|
|
'C: incremental import create pack from stdin' \
|
|
|
|
'git-fast-import <input &&
|
|
|
|
git-whatchanged branch'
|
|
|
|
test_expect_success \
|
|
|
|
'C: verify pack' \
|
|
|
|
'for p in .git/objects/pack/*.pack;do git-verify-pack $p||exit;done'
|
|
|
|
test_expect_success \
|
|
|
|
'C: validate reuse existing blob' \
|
|
|
|
'test $newf = `git-rev-parse --verify branch:file2/newf`
|
|
|
|
test $oldf = `git-rev-parse --verify branch:file2/oldf`'
|
|
|
|
|
|
|
|
cat >expect <<EOF
|
|
|
|
parent `git-rev-parse --verify master^0`
|
|
|
|
author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
|
|
|
|
second
|
|
|
|
EOF
|
|
|
|
test_expect_success \
|
|
|
|
'C: verify commit' \
|
|
|
|
'git-cat-file commit branch | sed 1d >actual &&
|
|
|
|
diff -u expect actual'
|
|
|
|
|
|
|
|
cat >expect <<EOF
|
|
|
|
:000000 100755 0000000000000000000000000000000000000000 f1fb5da718392694d0076d677d6d0e364c79b0bc A file2/newf
|
|
|
|
:100644 100644 7123f7f44e39be127c5eb701e5968176ee9d78b1 7123f7f44e39be127c5eb701e5968176ee9d78b1 R100 file2 file2/oldf
|
|
|
|
:100644 000000 0d92e9f3374ae2947c23aa477cbc68ce598135f1 0000000000000000000000000000000000000000 D file3
|
|
|
|
EOF
|
|
|
|
git-diff-tree -M -r master branch >actual
|
|
|
|
test_expect_success \
|
|
|
|
'C: validate rename result' \
|
|
|
|
'compare_diff_raw expect actual'
|
|
|
|
|
2007-01-18 21:17:58 +01:00
|
|
|
###
|
|
|
|
### series D
|
|
|
|
###
|
|
|
|
|
|
|
|
test_tick
|
|
|
|
cat >input <<INPUT_END
|
|
|
|
commit refs/heads/branch
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
third
|
|
|
|
COMMIT
|
|
|
|
|
|
|
|
from refs/heads/branch^0
|
|
|
|
M 644 inline newdir/interesting
|
|
|
|
data <<EOF
|
|
|
|
$file5_data
|
|
|
|
EOF
|
|
|
|
|
|
|
|
M 755 inline newdir/exec.sh
|
|
|
|
data <<EOF
|
|
|
|
$file6_data
|
|
|
|
EOF
|
|
|
|
|
|
|
|
INPUT_END
|
|
|
|
test_expect_success \
|
|
|
|
'D: inline data in commit' \
|
|
|
|
'git-fast-import <input &&
|
|
|
|
git-whatchanged branch'
|
|
|
|
test_expect_success \
|
|
|
|
'D: verify pack' \
|
|
|
|
'for p in .git/objects/pack/*.pack;do git-verify-pack $p||exit;done'
|
|
|
|
|
|
|
|
cat >expect <<EOF
|
|
|
|
:000000 100755 0000000000000000000000000000000000000000 35a59026a33beac1569b1c7f66f3090ce9c09afc A newdir/exec.sh
|
|
|
|
:000000 100644 0000000000000000000000000000000000000000 046d0371e9220107917db0d0e030628de8a1de9b A newdir/interesting
|
|
|
|
EOF
|
|
|
|
git-diff-tree -M -r branch^ branch >actual
|
|
|
|
test_expect_success \
|
|
|
|
'D: validate new files added' \
|
|
|
|
'compare_diff_raw expect actual'
|
|
|
|
|
|
|
|
echo "$file5_data" >expect
|
|
|
|
test_expect_success \
|
|
|
|
'D: verify file5' \
|
|
|
|
'git-cat-file blob branch:newdir/interesting >actual &&
|
|
|
|
diff -u expect actual'
|
|
|
|
|
|
|
|
echo "$file6_data" >expect
|
|
|
|
test_expect_success \
|
|
|
|
'D: verify file6' \
|
|
|
|
'git-cat-file blob branch:newdir/exec.sh >actual &&
|
|
|
|
diff -u expect actual'
|
|
|
|
|
2007-01-18 19:26:24 +01:00
|
|
|
test_done
|