[thirdparty/git.git] / t / t9300-fast-import.sh

#!/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

file2_data='file2
second line of EOF'

file3_data='EOF
in 3rd file
 END'

file4_data=abcd
file4_len=4

file5_data='an inline file.
  we should see it later.'

file6_data='#!/bin/sh
echo "$@"'

###
### series A
###

test_tick
cat >input <<INPUT_END
blob
mark :2
data <<EOF
$file2_data
EOF

blob
mark :3
data <<END
$file3_data
END

blob
mark :4
data $file4_len
$file4_data
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 &&
	git diff 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 &&
	 git diff expect actual'

echo "$file2_data" >expect
test_expect_success \
	'A: verify file2' \
	'git cat-file blob master:file2 >actual && git diff expect actual'

echo "$file3_data" >expect
test_expect_success \
	'A: verify file3' \
	'git cat-file blob master:file3 >actual && git diff expect actual'

printf "$file4_data" >expect
test_expect_success \
	'A: verify file4' \
	'git cat-file blob master:file4 >actual && git diff 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' \
	'git diff expect marks.out'

test_expect_success \
	'A: verify marks import' \
	'git-fast-import \
		--import-marks=marks.out \
		--export-marks=marks.new \
		</dev/null &&
	git diff -u expect marks.new'

test_tick
cat >input <<INPUT_END
commit refs/heads/verify--import-marks
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
data <<COMMIT
recreate from :5
COMMIT

from :5
M 755 :2 copy-of-file2

INPUT_END
test_expect_success \
	'A: verify marks import does not crash' \
	'git-fast-import --import-marks=marks.out <input &&
	 git whatchanged verify--import-marks'
test_expect_success \
	'A: verify pack' \
	'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'
cat >expect <<EOF
:000000 100755 0000000000000000000000000000000000000000 7123f7f44e39be127c5eb701e5968176ee9d78b1 A	copy-of-file2
EOF
git diff-tree -M -r master verify--import-marks >actual
test_expect_success \
	'A: verify diff' \
	'compare_diff_raw expect actual &&
	 test `git rev-parse --verify master:file2` \
	    = `git rev-parse --verify verify--import-marks:copy-of-file2`'

###
### 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 &&
	 git diff 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'

###
### 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 &&
	 git diff expect actual'

echo "$file6_data" >expect
test_expect_success \
	'D: verify file6' \
	'git cat-file blob branch:newdir/exec.sh >actual &&
	 git diff expect actual'

###
### series E
###

cat >input <<INPUT_END
commit refs/heads/branch
author $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> Tue Feb 6 11:22:18 2007 -0500
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> Tue Feb 6 12:35:02 2007 -0500
data <<COMMIT
RFC 2822 type date
COMMIT

from refs/heads/branch^0

INPUT_END
test_expect_failure \
    'E: rfc2822 date, --date-format=raw' \
    'git-fast-import --date-format=raw <input'
test_expect_success \
    'E: rfc2822 date, --date-format=rfc2822' \
    'git-fast-import --date-format=rfc2822 <input'
test_expect_success \
	'E: verify pack' \
	'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'

cat >expect <<EOF
author $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> 1170778938 -0500
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1170783302 -0500

RFC 2822 type date
EOF
test_expect_success \
	'E: verify commit' \
	'git cat-file commit branch | sed 1,2d >actual &&
	git diff expect actual'

###
### series F
###

old_branch=`git rev-parse --verify branch^0`
test_tick
cat >input <<INPUT_END
commit refs/heads/branch
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
data <<COMMIT
losing things already?
COMMIT

from refs/heads/branch~1

reset refs/heads/other
from refs/heads/branch

INPUT_END
test_expect_success \
    'F: non-fast-forward update skips' \
    'if git-fast-import <input
	 then
		echo BAD gfi did not fail
		return 1
	 else
		if test $old_branch = `git rev-parse --verify branch^0`
		then
			: branch unaffected and failure returned
			return 0
		else
			echo BAD gfi changed branch $old_branch
			return 1
		fi
	 fi
	'
test_expect_success \
	'F: verify pack' \
	'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'

cat >expect <<EOF
tree `git rev-parse branch~1^{tree}`
parent `git rev-parse branch~1`
author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE

losing things already?
EOF
test_expect_success \
	'F: verify other commit' \
	'git cat-file commit other >actual &&
	git diff expect actual'

###
### series G
###

old_branch=`git rev-parse --verify branch^0`
test_tick
cat >input <<INPUT_END
commit refs/heads/branch
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
data <<COMMIT
losing things already?
COMMIT

from refs/heads/branch~1

INPUT_END
test_expect_success \
    'G: non-fast-forward update forced' \
    'git-fast-import --force <input'
test_expect_success \
	'G: verify pack' \
	'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'
test_expect_success \
	'G: branch changed, but logged' \
	'test $old_branch != `git rev-parse --verify branch^0` &&
	 test $old_branch = `git rev-parse --verify branch@{1}`'

###
### series H
###

test_tick
cat >input <<INPUT_END
commit refs/heads/H
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
data <<COMMIT
third
COMMIT

from refs/heads/branch^0
M 644 inline i-will-die
data <<EOF
this file will never exist.
EOF

deleteall
M 644 inline h/e/l/lo
data <<EOF
$file5_data
EOF

INPUT_END
test_expect_success \
    'H: deletall, add 1' \
    'git-fast-import <input &&
	 git whatchanged H'
test_expect_success \
	'H: verify pack' \
	'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'

cat >expect <<EOF
:100755 000000 f1fb5da718392694d0076d677d6d0e364c79b0bc 0000000000000000000000000000000000000000 D	file2/newf
:100644 000000 7123f7f44e39be127c5eb701e5968176ee9d78b1 0000000000000000000000000000000000000000 D	file2/oldf
:100755 000000 85df50785d62d3b05ab03d9cbf7e4a0b49449730 0000000000000000000000000000000000000000 D	file4
:100644 100644 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 R100	newdir/interesting	h/e/l/lo
:100755 000000 e74b7d465e52746be2b4bae983670711e6e66657 0000000000000000000000000000000000000000 D	newdir/exec.sh
EOF
git diff-tree -M -r H^ H >actual
test_expect_success \
	'H: validate old files removed, new files added' \
	'compare_diff_raw expect actual'

echo "$file5_data" >expect
test_expect_success \
	'H: verify file' \
	'git cat-file blob H:h/e/l/lo >actual &&
	 git diff expect actual'

###
### series I
###

cat >input <<INPUT_END
commit refs/heads/export-boundary
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
data <<COMMIT
we have a border.  its only 40 characters wide.
COMMIT

from refs/heads/branch

INPUT_END
test_expect_success \
    'I: export-pack-edges' \
    'git-fast-import --export-pack-edges=edges.list <input'

cat >expect <<EOF
.git/objects/pack/pack-.pack: `git rev-parse --verify export-boundary`
EOF
test_expect_success \
	'I: verify edge list' \
	'sed -e s/pack-.*pack/pack-.pack/ edges.list >actual &&
	 git diff expect actual'

###
### series J
###

cat >input <<INPUT_END
commit refs/heads/J
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
data <<COMMIT
create J
COMMIT

from refs/heads/branch

reset refs/heads/J

commit refs/heads/J
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
data <<COMMIT
initialize J
COMMIT

INPUT_END
test_expect_success \
    'J: reset existing branch creates empty commit' \
    'git-fast-import <input'
test_expect_success \
	'J: branch has 1 commit, empty tree' \
	'test 1 = `git rev-list J | wc -l` &&
	 test 0 = `git ls-tree J | wc -l`'

###
### series K
###

cat >input <<INPUT_END
commit refs/heads/K
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
data <<COMMIT
create K
COMMIT

from refs/heads/branch

commit refs/heads/K
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
data <<COMMIT
redo K
COMMIT

from refs/heads/branch^1

INPUT_END
test_expect_success \
    'K: reinit branch with from' \
    'git-fast-import <input'
test_expect_success \
    'K: verify K^1 = branch^1' \
    'test `git rev-parse --verify branch^1` \
		= `git rev-parse --verify K^1`'

###
### series L
###

cat >input <<INPUT_END
blob
mark :1
data <<EOF
some data
EOF

blob
mark :2
data <<EOF
other data
EOF

commit refs/heads/L
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
data <<COMMIT
create L
COMMIT

M 644 :1 b.
M 644 :1 b/other
M 644 :1 ba

commit refs/heads/L
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
data <<COMMIT
update L
COMMIT

M 644 :2 b.
M 644 :2 b/other
M 644 :2 ba
INPUT_END

cat >expect <<EXPECT_END
:100644 100644 4268632... 55d3a52... M	b.
:040000 040000 0ae5cac... 443c768... M	b
:100644 100644 4268632... 55d3a52... M	ba
EXPECT_END

test_expect_success \
    'L: verify internal tree sorting' \
	'git-fast-import <input &&
	 git diff --raw L^ L >output &&
	 git diff expect output'

test_done
Commit	Line	Data
50aee995 SP	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	. ../diff-lib.sh ;# test-lib chdir's into trash
	9
8232dc42 SP	10	file2_data='file2
	11	second line of EOF'
	12
	13	file3_data='EOF
	14	in 3rd file
	15	END'
	16
	17	file4_data=abcd
	18	file4_len=4
	19
b715cfbb SP	20	file5_data='an inline file.
	21	we should see it later.'
	22
	23	file6_data='#!/bin/sh
	24	echo "$@"'
	25
50aee995 SP	26	###
	27	### series A
	28	###
	29
	30	test_tick
	31	cat >input <<INPUT_END
	32	blob
	33	mark :2
	34	data <<EOF
8232dc42	35	$file2_data
50aee995 SP	36	EOF
	37
	38	blob
	39	mark :3
	40	data <<END
8232dc42	41	$file3_data
50aee995 SP	42	END
	43
	44	blob
	45	mark :4
8232dc42 SP	46	data $file4_len
8232dc42 SP	47	$file4_data
50aee995 SP	48	commit refs/heads/master
	49	mark :5
	50	committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
	51	data <<COMMIT
	52	initial
	53	COMMIT
	54
	55	M 644 :2 file2
	56	M 644 :3 file3
	57	M 755 :4 file4
	58
	59	INPUT_END
	60	test_expect_success \
	61	'A: create pack from stdin' \
	62	'git-fast-import --export-marks=marks.out <input &&
5be60078	63	git whatchanged master'
50aee995 SP	64	test_expect_success \
50aee995 SP	65	'A: verify pack' \
5be60078	66	'for p in .git/objects/pack/*.pack;do git verify-pack $p\|\|exit;done'
50aee995 SP	67
	68	cat >expect <<EOF
	69	author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
	70	committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
	71
	72	initial
	73	EOF
	74	test_expect_success \
	75	'A: verify commit' \
5be60078	76	'git cat-file commit master \| sed 1d >actual &&
5bd74506	77	git diff expect actual'
50aee995 SP	78
	79	cat >expect <<EOF
	80	100644 blob file2
	81	100644 blob file3
	82	100755 blob file4
	83	EOF
	84	test_expect_success \
	85	'A: verify tree' \
5be60078	86	'git cat-file -p master^{tree} \| sed "s/ [0-9a-f]* / /" >actual &&
5bd74506	87	git diff expect actual'
50aee995	88
8232dc42	89	echo "$file2_data" >expect
50aee995 SP	90	test_expect_success \
50aee995 SP	91	'A: verify file2' \
5be60078	92	'git cat-file blob master:file2 >actual && git diff expect actual'
50aee995	93
8232dc42	94	echo "$file3_data" >expect
50aee995 SP	95	test_expect_success \
50aee995 SP	96	'A: verify file3' \
5be60078	97	'git cat-file blob master:file3 >actual && git diff expect actual'
50aee995	98
8232dc42	99	printf "$file4_data" >expect
50aee995 SP	100	test_expect_success \
50aee995 SP	101	'A: verify file4' \
5be60078	102	'git cat-file blob master:file4 >actual && git diff expect actual'
50aee995 SP	103
50aee995 SP	104	cat >expect <<EOF
5be60078 JH	105	:2 `git rev-parse --verify master:file2`
	106	:3 `git rev-parse --verify master:file3`
	107	:4 `git rev-parse --verify master:file4`
	108	:5 `git rev-parse --verify master^0`
50aee995 SP	109	EOF
	110	test_expect_success \
	111	'A: verify marks output' \
5bd74506	112	'git diff expect marks.out'
50aee995	113
e8438420 SP	114	test_expect_success \
	115	'A: verify marks import' \
	116	'git-fast-import \
	117	--import-marks=marks.out \
	118	--export-marks=marks.new \
	119	</dev/null &&
cf6981d4	120	git diff -u expect marks.new'
e8438420	121
aac65ed1 SP	122	test_tick
	123	cat >input <<INPUT_END
	124	commit refs/heads/verify--import-marks
	125	committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
	126	data <<COMMIT
	127	recreate from :5
	128	COMMIT
	129
	130	from :5
	131	M 755 :2 copy-of-file2
	132
	133	INPUT_END
	134	test_expect_success \
	135	'A: verify marks import does not crash' \
	136	'git-fast-import --import-marks=marks.out <input &&
5be60078	137	git whatchanged verify--import-marks'
aac65ed1 SP	138	test_expect_success \
aac65ed1 SP	139	'A: verify pack' \
5be60078	140	'for p in .git/objects/pack/*.pack;do git verify-pack $p\|\|exit;done'
aac65ed1 SP	141	cat >expect <<EOF
	142	:000000 100755 0000000000000000000000000000000000000000 7123f7f44e39be127c5eb701e5968176ee9d78b1 A copy-of-file2
	143	EOF
5be60078	144	git diff-tree -M -r master verify--import-marks >actual
aac65ed1 SP	145	test_expect_success \
	146	'A: verify diff' \
	147	'compare_diff_raw expect actual &&
5be60078 JH	148	test `git rev-parse --verify master:file2` \
5be60078 JH	149	= `git rev-parse --verify verify--import-marks:copy-of-file2`'
aac65ed1	150
50aee995 SP	151	###
	152	### series B
	153	###
	154
	155	test_tick
	156	cat >input <<INPUT_END
	157	commit refs/heads/branch
	158	mark :1
	159	committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
	160	data <<COMMIT
	161	corrupt
	162	COMMIT
	163
	164	from refs/heads/master
	165	M 755 0000000000000000000000000000000000000001 zero1
	166
	167	INPUT_END
	168	test_expect_failure \
	169	'B: fail on invalid blob sha1' \
	170	'git-fast-import <input'
	171	rm -f .git/objects/pack_* .git/objects/index_*
	172
	173	###
	174	### series C
	175	###
	176
	177	newf=`echo hi newf \| git-hash-object -w --stdin`
5be60078	178	oldf=`git rev-parse --verify master:file2`
50aee995 SP	179	test_tick
	180	cat >input <<INPUT_END
	181	commit refs/heads/branch
	182	committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
	183	data <<COMMIT
	184	second
	185	COMMIT
	186
	187	from refs/heads/master
	188	M 644 $oldf file2/oldf
	189	M 755 $newf file2/newf
	190	D file3
	191
	192	INPUT_END
	193	test_expect_success \
	194	'C: incremental import create pack from stdin' \
	195	'git-fast-import <input &&
5be60078	196	git whatchanged branch'
50aee995 SP	197	test_expect_success \
50aee995 SP	198	'C: verify pack' \
5be60078	199	'for p in .git/objects/pack/*.pack;do git verify-pack $p\|\|exit;done'
50aee995 SP	200	test_expect_success \
50aee995 SP	201	'C: validate reuse existing blob' \
5be60078 JH	202	'test $newf = `git rev-parse --verify branch:file2/newf`
5be60078 JH	203	test $oldf = `git rev-parse --verify branch:file2/oldf`'
50aee995 SP	204
50aee995 SP	205	cat >expect <<EOF
5be60078	206	parent `git rev-parse --verify master^0`
50aee995 SP	207	author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
	208	committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
	209
	210	second
	211	EOF
	212	test_expect_success \
	213	'C: verify commit' \
5be60078	214	'git cat-file commit branch \| sed 1d >actual &&
5bd74506	215	git diff expect actual'
50aee995 SP	216
	217	cat >expect <<EOF
	218	:000000 100755 0000000000000000000000000000000000000000 f1fb5da718392694d0076d677d6d0e364c79b0bc A file2/newf
	219	:100644 100644 7123f7f44e39be127c5eb701e5968176ee9d78b1 7123f7f44e39be127c5eb701e5968176ee9d78b1 R100 file2 file2/oldf
	220	:100644 000000 0d92e9f3374ae2947c23aa477cbc68ce598135f1 0000000000000000000000000000000000000000 D file3
	221	EOF
5be60078	222	git diff-tree -M -r master branch >actual
50aee995 SP	223	test_expect_success \
	224	'C: validate rename result' \
	225	'compare_diff_raw expect actual'
	226
b715cfbb SP	227	###
	228	### series D
	229	###
	230
	231	test_tick
	232	cat >input <<INPUT_END
	233	commit refs/heads/branch
	234	committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
	235	data <<COMMIT
	236	third
	237	COMMIT
	238
	239	from refs/heads/branch^0
	240	M 644 inline newdir/interesting
	241	data <<EOF
	242	$file5_data
	243	EOF
	244
	245	M 755 inline newdir/exec.sh
	246	data <<EOF
	247	$file6_data
	248	EOF
	249
	250	INPUT_END
	251	test_expect_success \
	252	'D: inline data in commit' \
	253	'git-fast-import <input &&
5be60078	254	git whatchanged branch'
b715cfbb SP	255	test_expect_success \
b715cfbb SP	256	'D: verify pack' \
5be60078	257	'for p in .git/objects/pack/*.pack;do git verify-pack $p\|\|exit;done'
b715cfbb SP	258
	259	cat >expect <<EOF
	260	:000000 100755 0000000000000000000000000000000000000000 35a59026a33beac1569b1c7f66f3090ce9c09afc A newdir/exec.sh
	261	:000000 100644 0000000000000000000000000000000000000000 046d0371e9220107917db0d0e030628de8a1de9b A newdir/interesting
	262	EOF
5be60078	263	git diff-tree -M -r branch^ branch >actual
b715cfbb SP	264	test_expect_success \
	265	'D: validate new files added' \
	266	'compare_diff_raw expect actual'
	267
	268	echo "$file5_data" >expect
	269	test_expect_success \
	270	'D: verify file5' \
5be60078	271	'git cat-file blob branch:newdir/interesting >actual &&
5bd74506	272	git diff expect actual'
b715cfbb SP	273
	274	echo "$file6_data" >expect
	275	test_expect_success \
	276	'D: verify file6' \
5be60078	277	'git cat-file blob branch:newdir/exec.sh >actual &&
5bd74506	278	git diff expect actual'
b715cfbb	279
63e0c8b3 SP	280	###
	281	### series E
	282	###
	283
	284	cat >input <<INPUT_END
	285	commit refs/heads/branch
	286	author $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> Tue Feb 6 11:22:18 2007 -0500
	287	committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> Tue Feb 6 12:35:02 2007 -0500
	288	data <<COMMIT
	289	RFC 2822 type date
	290	COMMIT
	291
	292	from refs/heads/branch^0
	293
	294	INPUT_END
	295	test_expect_failure \
	296	'E: rfc2822 date, --date-format=raw' \
	297	'git-fast-import --date-format=raw <input'
	298	test_expect_success \
	299	'E: rfc2822 date, --date-format=rfc2822' \
	300	'git-fast-import --date-format=rfc2822 <input'
	301	test_expect_success \
	302	'E: verify pack' \
5be60078	303	'for p in .git/objects/pack/*.pack;do git verify-pack $p\|\|exit;done'
63e0c8b3 SP	304
	305	cat >expect <<EOF
	306	author $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> 1170778938 -0500
	307	committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1170783302 -0500
	308
	309	RFC 2822 type date
	310	EOF
	311	test_expect_success \
	312	'E: verify commit' \
5be60078	313	'git cat-file commit branch \| sed 1,2d >actual &&
5bd74506	314	git diff expect actual'
63e0c8b3	315
7073e69e SP	316	###
	317	### series F
	318	###
	319
5be60078	320	old_branch=`git rev-parse --verify branch^0`
7073e69e SP	321	test_tick
	322	cat >input <<INPUT_END
	323	commit refs/heads/branch
	324	committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
	325	data <<COMMIT
	326	losing things already?
	327	COMMIT
	328
	329	from refs/heads/branch~1
	330
	331	reset refs/heads/other
	332	from refs/heads/branch
	333
	334	INPUT_END
	335	test_expect_success \
	336	'F: non-fast-forward update skips' \
	337	'if git-fast-import <input
	338	then
	339	echo BAD gfi did not fail
	340	return 1
	341	else
5be60078	342	if test $old_branch = `git rev-parse --verify branch^0`
7073e69e SP	343	then
	344	: branch unaffected and failure returned
	345	return 0
	346	else
	347	echo BAD gfi changed branch $old_branch
	348	return 1
	349	fi
	350	fi
	351	'
	352	test_expect_success \
	353	'F: verify pack' \
5be60078	354	'for p in .git/objects/pack/*.pack;do git verify-pack $p\|\|exit;done'
7073e69e SP	355
7073e69e SP	356	cat >expect <<EOF
5be60078 JH	357	tree `git rev-parse branch~1^{tree}`
5be60078 JH	358	parent `git rev-parse branch~1`
7073e69e SP	359	author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
	360	committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
	361
	362	losing things already?
	363	EOF
	364	test_expect_success \
	365	'F: verify other commit' \
5be60078	366	'git cat-file commit other >actual &&
5bd74506	367	git diff expect actual'
7073e69e SP	368
	369	###
	370	### series G
	371	###
	372
5be60078	373	old_branch=`git rev-parse --verify branch^0`
7073e69e SP	374	test_tick
	375	cat >input <<INPUT_END
	376	commit refs/heads/branch
	377	committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
	378	data <<COMMIT
	379	losing things already?
	380	COMMIT
	381
	382	from refs/heads/branch~1
	383
	384	INPUT_END
	385	test_expect_success \
	386	'G: non-fast-forward update forced' \
	387	'git-fast-import --force <input'
	388	test_expect_success \
	389	'G: verify pack' \
5be60078	390	'for p in .git/objects/pack/*.pack;do git verify-pack $p\|\|exit;done'
7073e69e SP	391	test_expect_success \
7073e69e SP	392	'G: branch changed, but logged' \
5be60078 JH	393	'test $old_branch != `git rev-parse --verify branch^0` &&
5be60078 JH	394	test $old_branch = `git rev-parse --verify branch@{1}`'
7073e69e	395
825769a8 SP	396	###
	397	### series H
	398	###
	399
	400	test_tick
	401	cat >input <<INPUT_END
	402	commit refs/heads/H
	403	committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
	404	data <<COMMIT
	405	third
	406	COMMIT
	407
	408	from refs/heads/branch^0
	409	M 644 inline i-will-die
	410	data <<EOF
	411	this file will never exist.
	412	EOF
	413
	414	deleteall
	415	M 644 inline h/e/l/lo
	416	data <<EOF
	417	$file5_data
	418	EOF
	419
	420	INPUT_END
	421	test_expect_success \
	422	'H: deletall, add 1' \
	423	'git-fast-import <input &&
5be60078	424	git whatchanged H'
825769a8 SP	425	test_expect_success \
825769a8 SP	426	'H: verify pack' \
5be60078	427	'for p in .git/objects/pack/*.pack;do git verify-pack $p\|\|exit;done'
825769a8 SP	428
	429	cat >expect <<EOF
	430	:100755 000000 f1fb5da718392694d0076d677d6d0e364c79b0bc 0000000000000000000000000000000000000000 D file2/newf
	431	:100644 000000 7123f7f44e39be127c5eb701e5968176ee9d78b1 0000000000000000000000000000000000000000 D file2/oldf
	432	:100755 000000 85df50785d62d3b05ab03d9cbf7e4a0b49449730 0000000000000000000000000000000000000000 D file4
	433	:100644 100644 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 R100 newdir/interesting h/e/l/lo
	434	:100755 000000 e74b7d465e52746be2b4bae983670711e6e66657 0000000000000000000000000000000000000000 D newdir/exec.sh
	435	EOF
5be60078	436	git diff-tree -M -r H^ H >actual
825769a8 SP	437	test_expect_success \
	438	'H: validate old files removed, new files added' \
	439	'compare_diff_raw expect actual'
	440
	441	echo "$file5_data" >expect
	442	test_expect_success \
	443	'H: verify file' \
5be60078	444	'git cat-file blob H:h/e/l/lo >actual &&
5bd74506	445	git diff expect actual'
825769a8	446
bdf1c06d SP	447	###
	448	### series I
	449	###
	450
	451	cat >input <<INPUT_END
	452	commit refs/heads/export-boundary
	453	committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
	454	data <<COMMIT
	455	we have a border. its only 40 characters wide.
	456	COMMIT
	457
	458	from refs/heads/branch
	459
	460	INPUT_END
	461	test_expect_success \
	462	'I: export-pack-edges' \
	463	'git-fast-import --export-pack-edges=edges.list <input'
	464
	465	cat >expect <<EOF
5be60078	466	.git/objects/pack/pack-.pack: `git rev-parse --verify export-boundary`
bdf1c06d SP	467	EOF
	468	test_expect_success \
	469	'I: verify edge list' \
	470	'sed -e s/pack-.*pack/pack-.pack/ edges.list >actual &&
5bd74506	471	git diff expect actual'
bdf1c06d	472
ea5e370a SP	473	###
	474	### series J
	475	###
	476
	477	cat >input <<INPUT_END
	478	commit refs/heads/J
	479	committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
	480	data <<COMMIT
	481	create J
	482	COMMIT
	483
	484	from refs/heads/branch
	485
	486	reset refs/heads/J
	487
	488	commit refs/heads/J
	489	committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
	490	data <<COMMIT
	491	initialize J
	492	COMMIT
	493
	494	INPUT_END
	495	test_expect_success \
	496	'J: reset existing branch creates empty commit' \
	497	'git-fast-import <input'
	498	test_expect_success \
	499	'J: branch has 1 commit, empty tree' \
5be60078	500	'test 1 = `git rev-list J \| wc -l` &&
ea5e370a SP	501	test 0 = `git ls-tree J \| wc -l`'
	502
	503	###
	504	### series K
	505	###
	506
	507	cat >input <<INPUT_END
	508	commit refs/heads/K
	509	committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
	510	data <<COMMIT
	511	create K
	512	COMMIT
	513
	514	from refs/heads/branch
	515
	516	commit refs/heads/K
	517	committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
	518	data <<COMMIT
	519	redo K
	520	COMMIT
	521
	522	from refs/heads/branch^1
	523
	524	INPUT_END
	525	test_expect_success \
	526	'K: reinit branch with from' \
	527	'git-fast-import <input'
	528	test_expect_success \
	529	'K: verify K^1 = branch^1' \
5be60078 JH	530	'test `git rev-parse --verify branch^1` \
5be60078 JH	531	= `git rev-parse --verify K^1`'
ea5e370a	532
e7411303 JK	533	###
	534	### series L
	535	###
	536
	537	cat >input <<INPUT_END
	538	blob
	539	mark :1
	540	data <<EOF
	541	some data
	542	EOF
	543
	544	blob
	545	mark :2
	546	data <<EOF
	547	other data
	548	EOF
	549
	550	commit refs/heads/L
	551	committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
	552	data <<COMMIT
	553	create L
	554	COMMIT
	555
	556	M 644 :1 b.
	557	M 644 :1 b/other
	558	M 644 :1 ba
	559
	560	commit refs/heads/L
	561	committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
	562	data <<COMMIT
	563	update L
	564	COMMIT
	565
	566	M 644 :2 b.
	567	M 644 :2 b/other
	568	M 644 :2 ba
	569	INPUT_END
	570
	571	cat >expect <<EXPECT_END
	572	:100644 100644 4268632... 55d3a52... M b.
	573	:040000 040000 0ae5cac... 443c768... M b
	574	:100644 100644 4268632... 55d3a52... M ba
	575	EXPECT_END
	576
	577	test_expect_success \
	578	'L: verify internal tree sorting' \
	579	'git-fast-import <input &&
5be60078	580	git diff --raw L^ L >output &&
e7411303 JK	581	git diff expect output'
e7411303 JK	582
50aee995	583	test_done