[thirdparty/git.git] / t / t6050-replace.sh

#!/bin/sh
#
# Copyright (c) 2008 Christian Couder
#
test_description='Tests replace refs functionality'

exec </dev/null

. ./test-lib.sh

add_and_commit_file()
{
    _file="$1"
    _msg="$2"

    git add $_file || return $?
    test_tick || return $?
    git commit --quiet -m "$_file: $_msg"
}

HASH1=
HASH2=
HASH3=
HASH4=
HASH5=
HASH6=
HASH7=

test_expect_success 'set up buggy branch' '
     echo "line 1" >> hello &&
     echo "line 2" >> hello &&
     echo "line 3" >> hello &&
     echo "line 4" >> hello &&
     add_and_commit_file hello "4 lines" &&
     HASH1=$(git rev-parse --verify HEAD) &&
     echo "line BUG" >> hello &&
     echo "line 6" >> hello &&
     echo "line 7" >> hello &&
     echo "line 8" >> hello &&
     add_and_commit_file hello "4 more lines with a BUG" &&
     HASH2=$(git rev-parse --verify HEAD) &&
     echo "line 9" >> hello &&
     echo "line 10" >> hello &&
     add_and_commit_file hello "2 more lines" &&
     HASH3=$(git rev-parse --verify HEAD) &&
     echo "line 11" >> hello &&
     add_and_commit_file hello "1 more line" &&
     HASH4=$(git rev-parse --verify HEAD) &&
     sed -e "s/BUG/5/" hello > hello.new &&
     mv hello.new hello &&
     add_and_commit_file hello "BUG fixed" &&
     HASH5=$(git rev-parse --verify HEAD) &&
     echo "line 12" >> hello &&
     echo "line 13" >> hello &&
     add_and_commit_file hello "2 more lines" &&
     HASH6=$(git rev-parse --verify HEAD) &&
     echo "line 14" >> hello &&
     echo "line 15" >> hello &&
     echo "line 16" >> hello &&
     add_and_commit_file hello "again 3 more lines" &&
     HASH7=$(git rev-parse --verify HEAD)
'

test_expect_success 'replace the author' '
     git cat-file commit $HASH2 | grep "author A U Thor" &&
     R=$(git cat-file commit $HASH2 | sed -e "s/A U/O/" | git hash-object -t commit --stdin -w) &&
     git cat-file commit $R | grep "author O Thor" &&
     git update-ref refs/replace/$HASH2 $R &&
     git show HEAD~5 | grep "O Thor" &&
     git show $HASH2 | grep "O Thor"
'

test_expect_success 'test --no-replace-objects option' '
     git cat-file commit $HASH2 | grep "author O Thor" &&
     git --no-replace-objects cat-file commit $HASH2 | grep "author A U Thor" &&
     git show $HASH2 | grep "O Thor" &&
     git --no-replace-objects show $HASH2 | grep "A U Thor"
'

test_expect_success 'test GIT_NO_REPLACE_OBJECTS env variable' '
     GIT_NO_REPLACE_OBJECTS=1 git cat-file commit $HASH2 | grep "author A U Thor" &&
     GIT_NO_REPLACE_OBJECTS=1 git show $HASH2 | grep "A U Thor"
'

cat >tag.sig <<EOF
object $HASH2
type commit
tag mytag
tagger T A Gger <> 0 +0000

EOF

test_expect_success 'tag replaced commit' '
     git mktag <tag.sig >.git/refs/tags/mytag 2>message
'

test_expect_success '"git fsck" works' '
     git fsck master > fsck_master.out &&
     grep "dangling commit $R" fsck_master.out &&
     grep "dangling tag $(cat .git/refs/tags/mytag)" fsck_master.out &&
     test -z "$(git fsck)"
'

test_expect_success 'repack, clone and fetch work' '
     git repack -a -d &&
     git clone --no-hardlinks . clone_dir &&
     (
	  cd clone_dir &&
	  git show HEAD~5 | grep "A U Thor" &&
	  git show $HASH2 | grep "A U Thor" &&
	  git cat-file commit $R &&
	  git repack -a -d &&
	  test_must_fail git cat-file commit $R &&
	  git fetch ../ "refs/replace/*:refs/replace/*" &&
	  git show HEAD~5 | grep "O Thor" &&
	  git show $HASH2 | grep "O Thor" &&
	  git cat-file commit $R
     )
'

test_expect_success '"git replace" listing and deleting' '
     test "$HASH2" = "$(git replace -l)" &&
     test "$HASH2" = "$(git replace)" &&
     aa=${HASH2%??????????????????????????????????????} &&
     test "$HASH2" = "$(git replace -l "$aa*")" &&
     test_must_fail git replace -d $R &&
     test_must_fail git replace -d &&
     test_must_fail git replace -l -d $HASH2 &&
     git replace -d $HASH2 &&
     git show $HASH2 | grep "A U Thor" &&
     test -z "$(git replace -l)"
'

test_expect_success '"git replace" replacing' '
     git replace $HASH2 $R &&
     git show $HASH2 | grep "O Thor" &&
     test_must_fail git replace $HASH2 $R &&
     git replace -f $HASH2 $R &&
     test_must_fail git replace -f &&
     test "$HASH2" = "$(git replace)"
'

test_expect_success '"git replace" resolves sha1' '
     SHORTHASH2=$(git rev-parse --short=8 $HASH2) &&
     git replace -d $SHORTHASH2 &&
     git replace $SHORTHASH2 $R &&
     git show $HASH2 | grep "O Thor" &&
     test_must_fail git replace $HASH2 $R &&
     git replace -f $HASH2 $R &&
     test_must_fail git replace -f &&
     test "$HASH2" = "$(git replace)"
'

# This creates a side branch where the bug in H2
# does not appear because P2 is created by applying
# H2 and squashing H5 into it.
# P3, P4 and P6 are created by cherry-picking H3, H4
# and H6 respectively.
#
# At this point, we should have the following:
#
#    P2--P3--P4--P6
#   /
# H1-H2-H3-H4-H5-H6-H7
#
# Then we replace H6 with P6.
#
test_expect_success 'create parallel branch without the bug' '
     git replace -d $HASH2 &&
     git show $HASH2 | grep "A U Thor" &&
     git checkout $HASH1 &&
     git cherry-pick $HASH2 &&
     git show $HASH5 | git apply &&
     git commit --amend -m "hello: 4 more lines WITHOUT the bug" hello &&
     PARA2=$(git rev-parse --verify HEAD) &&
     git cherry-pick $HASH3 &&
     PARA3=$(git rev-parse --verify HEAD) &&
     git cherry-pick $HASH4 &&
     PARA4=$(git rev-parse --verify HEAD) &&
     git cherry-pick $HASH6 &&
     PARA6=$(git rev-parse --verify HEAD) &&
     git replace $HASH6 $PARA6 &&
     git checkout master &&
     cur=$(git rev-parse --verify HEAD) &&
     test "$cur" = "$HASH7" &&
     git log --pretty=oneline | grep $PARA2 &&
     git remote add cloned ./clone_dir
'

test_expect_success 'push to cloned repo' '
     git push cloned $HASH6^:refs/heads/parallel &&
     (
	  cd clone_dir &&
	  git checkout parallel &&
	  git log --pretty=oneline | grep $PARA2
     )
'

test_expect_success 'push branch with replacement' '
     git cat-file commit $PARA3 | grep "author A U Thor" &&
     S=$(git cat-file commit $PARA3 | sed -e "s/A U/O/" | git hash-object -t commit --stdin -w) &&
     git cat-file commit $S | grep "author O Thor" &&
     git replace $PARA3 $S &&
     git show $HASH6~2 | grep "O Thor" &&
     git show $PARA3 | grep "O Thor" &&
     git push cloned $HASH6^:refs/heads/parallel2 &&
     (
	  cd clone_dir &&
	  git checkout parallel2 &&
	  git log --pretty=oneline | grep $PARA3 &&
	  git show $PARA3 | grep "A U Thor"
     )
'

test_expect_success 'fetch branch with replacement' '
     git branch tofetch $HASH6 &&
     (
	  cd clone_dir &&
	  git fetch origin refs/heads/tofetch:refs/heads/parallel3 &&
	  git log --pretty=oneline parallel3 > output.txt &&
	  ! grep $PARA3 output.txt &&
	  git show $PARA3 > para3.txt &&
	  grep "A U Thor" para3.txt &&
	  git fetch origin "refs/replace/*:refs/replace/*" &&
	  git log --pretty=oneline parallel3 > output.txt &&
	  grep $PARA3 output.txt &&
	  git show $PARA3 > para3.txt &&
	  grep "O Thor" para3.txt
     )
'

test_expect_success 'bisect and replacements' '
     git bisect start $HASH7 $HASH1 &&
     test "$PARA3" = "$(git rev-parse --verify HEAD)" &&
     git bisect reset &&
     GIT_NO_REPLACE_OBJECTS=1 git bisect start $HASH7 $HASH1 &&
     test "$HASH4" = "$(git rev-parse --verify HEAD)" &&
     git bisect reset &&
     git --no-replace-objects bisect start $HASH7 $HASH1 &&
     test "$HASH4" = "$(git rev-parse --verify HEAD)" &&
     git bisect reset
'

test_expect_success 'index-pack and replacements' '
	git --no-replace-objects rev-list --objects HEAD |
	git --no-replace-objects pack-objects test- &&
	git index-pack test-*.pack
'

test_expect_success 'not just commits' '
	echo replaced >file &&
	git add file &&
	REPLACED=$(git rev-parse :file) &&
	mv file file.replaced &&

	echo original >file &&
	git add file &&
	ORIGINAL=$(git rev-parse :file) &&
	git update-ref refs/replace/$ORIGINAL $REPLACED &&
	mv file file.original &&

	git checkout file &&
	test_cmp file.replaced file
'

test_expect_success 'replaced and replacement objects must be of the same type' '
	test_must_fail git replace mytag $HASH1 &&
	test_must_fail git replace HEAD^{tree} HEAD~1 &&
	BLOB=$(git rev-parse :file) &&
	test_must_fail git replace HEAD^ $BLOB
'

test_expect_success '-f option bypasses the type check' '
	git replace -f mytag $HASH1 &&
	git replace -f HEAD^{tree} HEAD~1 &&
	git replace -f HEAD^ $BLOB
'

test_done
Commit	Line	Data
a3e82672 CC	1	#!/bin/sh
	2	#
	3	# Copyright (c) 2008 Christian Couder
	4	#
	5	test_description='Tests replace refs functionality'
	6
	7	exec </dev/null
	8
	9	. ./test-lib.sh
	10
	11	add_and_commit_file()
	12	{
	13	_file="$1"
	14	_msg="$2"
	15
	16	git add $_file \|\| return $?
	17	test_tick \|\| return $?
	18	git commit --quiet -m "$_file: $_msg"
	19	}
	20
	21	HASH1=
	22	HASH2=
	23	HASH3=
	24	HASH4=
	25	HASH5=
	26	HASH6=
	27	HASH7=
	28
	29	test_expect_success 'set up buggy branch' '
	30	echo "line 1" >> hello &&
	31	echo "line 2" >> hello &&
	32	echo "line 3" >> hello &&
	33	echo "line 4" >> hello &&
	34	add_and_commit_file hello "4 lines" &&
	35	HASH1=$(git rev-parse --verify HEAD) &&
	36	echo "line BUG" >> hello &&
	37	echo "line 6" >> hello &&
	38	echo "line 7" >> hello &&
	39	echo "line 8" >> hello &&
	40	add_and_commit_file hello "4 more lines with a BUG" &&
	41	HASH2=$(git rev-parse --verify HEAD) &&
	42	echo "line 9" >> hello &&
	43	echo "line 10" >> hello &&
	44	add_and_commit_file hello "2 more lines" &&
	45	HASH3=$(git rev-parse --verify HEAD) &&
	46	echo "line 11" >> hello &&
	47	add_and_commit_file hello "1 more line" &&
	48	HASH4=$(git rev-parse --verify HEAD) &&
	49	sed -e "s/BUG/5/" hello > hello.new &&
	50	mv hello.new hello &&
	51	add_and_commit_file hello "BUG fixed" &&
	52	HASH5=$(git rev-parse --verify HEAD) &&
	53	echo "line 12" >> hello &&
	54	echo "line 13" >> hello &&
	55	add_and_commit_file hello "2 more lines" &&
a48fcd83	56	HASH6=$(git rev-parse --verify HEAD) &&
a3e82672 CC	57	echo "line 14" >> hello &&
	58	echo "line 15" >> hello &&
	59	echo "line 16" >> hello &&
	60	add_and_commit_file hello "again 3 more lines" &&
	61	HASH7=$(git rev-parse --verify HEAD)
	62	'
	63
	64	test_expect_success 'replace the author' '
	65	git cat-file commit $HASH2 \| grep "author A U Thor" &&
	66	R=$(git cat-file commit $HASH2 \| sed -e "s/A U/O/" \| git hash-object -t commit --stdin -w) &&
	67	git cat-file commit $R \| grep "author O Thor" &&
	68	git update-ref refs/replace/$HASH2 $R &&
	69	git show HEAD~5 \| grep "O Thor" &&
	70	git show $HASH2 \| grep "O Thor"
	71	'
	72
b0fa7ab5 CC	73	test_expect_success 'test --no-replace-objects option' '
	74	git cat-file commit $HASH2 \| grep "author O Thor" &&
	75	git --no-replace-objects cat-file commit $HASH2 \| grep "author A U Thor" &&
	76	git show $HASH2 \| grep "O Thor" &&
	77	git --no-replace-objects show $HASH2 \| grep "A U Thor"
	78	'
	79
6476b38b CC	80	test_expect_success 'test GIT_NO_REPLACE_OBJECTS env variable' '
	81	GIT_NO_REPLACE_OBJECTS=1 git cat-file commit $HASH2 \| grep "author A U Thor" &&
	82	GIT_NO_REPLACE_OBJECTS=1 git show $HASH2 \| grep "A U Thor"
	83	'
	84
cc400f50 CC	85	cat >tag.sig <<EOF
	86	object $HASH2
	87	type commit
	88	tag mytag
	89	tagger T A Gger <> 0 +0000
	90
	91	EOF
	92
	93	test_expect_success 'tag replaced commit' '
	94	git mktag <tag.sig >.git/refs/tags/mytag 2>message
	95	'
	96
dae556bd CC	97	test_expect_success '"git fsck" works' '
	98	git fsck master > fsck_master.out &&
	99	grep "dangling commit $R" fsck_master.out &&
	100	grep "dangling tag $(cat .git/refs/tags/mytag)" fsck_master.out &&
	101	test -z "$(git fsck)"
	102	'
	103
	104	test_expect_success 'repack, clone and fetch work' '
	105	git repack -a -d &&
	106	git clone --no-hardlinks . clone_dir &&
18a82692 JN	107	(
	108	cd clone_dir &&
	109	git show HEAD~5 \| grep "A U Thor" &&
	110	git show $HASH2 \| grep "A U Thor" &&
	111	git cat-file commit $R &&
	112	git repack -a -d &&
	113	test_must_fail git cat-file commit $R &&
	114	git fetch ../ "refs/replace/:refs/replace/" &&
	115	git show HEAD~5 \| grep "O Thor" &&
	116	git show $HASH2 \| grep "O Thor" &&
	117	git cat-file commit $R
fd4ec4f2	118	)
dae556bd CC	119	'
dae556bd CC	120
54b0c1e0 CC	121	test_expect_success '"git replace" listing and deleting' '
	122	test "$HASH2" = "$(git replace -l)" &&
	123	test "$HASH2" = "$(git replace)" &&
	124	aa=${HASH2%??????????????????????????????????????} &&
	125	test "$HASH2" = "$(git replace -l "$aa*")" &&
	126	test_must_fail git replace -d $R &&
	127	test_must_fail git replace -d &&
	128	test_must_fail git replace -l -d $HASH2 &&
	129	git replace -d $HASH2 &&
bebdd271	130	git show $HASH2 \| grep "A U Thor" &&
54b0c1e0 CC	131	test -z "$(git replace -l)"
	132	'
	133
bebdd271 CC	134	test_expect_success '"git replace" replacing' '
	135	git replace $HASH2 $R &&
	136	git show $HASH2 \| grep "O Thor" &&
	137	test_must_fail git replace $HASH2 $R &&
	138	git replace -f $HASH2 $R &&
	139	test_must_fail git replace -f &&
	140	test "$HASH2" = "$(git replace)"
	141	'
	142
9dfc3684 MG	143	test_expect_success '"git replace" resolves sha1' '
	144	SHORTHASH2=$(git rev-parse --short=8 $HASH2) &&
	145	git replace -d $SHORTHASH2 &&
	146	git replace $SHORTHASH2 $R &&
	147	git show $HASH2 \| grep "O Thor" &&
	148	test_must_fail git replace $HASH2 $R &&
	149	git replace -f $HASH2 $R &&
	150	test_must_fail git replace -f &&
	151	test "$HASH2" = "$(git replace)"
	152	'
	153
4e65b538 CC	154	# This creates a side branch where the bug in H2
	155	# does not appear because P2 is created by applying
	156	# H2 and squashing H5 into it.
	157	# P3, P4 and P6 are created by cherry-picking H3, H4
	158	# and H6 respectively.
	159	#
	160	# At this point, we should have the following:
	161	#
	162	# P2--P3--P4--P6
	163	# /
	164	# H1-H2-H3-H4-H5-H6-H7
	165	#
	166	# Then we replace H6 with P6.
	167	#
	168	test_expect_success 'create parallel branch without the bug' '
	169	git replace -d $HASH2 &&
	170	git show $HASH2 \| grep "A U Thor" &&
	171	git checkout $HASH1 &&
	172	git cherry-pick $HASH2 &&
	173	git show $HASH5 \| git apply &&
	174	git commit --amend -m "hello: 4 more lines WITHOUT the bug" hello &&
	175	PARA2=$(git rev-parse --verify HEAD) &&
	176	git cherry-pick $HASH3 &&
	177	PARA3=$(git rev-parse --verify HEAD) &&
	178	git cherry-pick $HASH4 &&
	179	PARA4=$(git rev-parse --verify HEAD) &&
	180	git cherry-pick $HASH6 &&
	181	PARA6=$(git rev-parse --verify HEAD) &&
	182	git replace $HASH6 $PARA6 &&
	183	git checkout master &&
	184	cur=$(git rev-parse --verify HEAD) &&
	185	test "$cur" = "$HASH7" &&
	186	git log --pretty=oneline \| grep $PARA2 &&
	187	git remote add cloned ./clone_dir
	188	'
	189
	190	test_expect_success 'push to cloned repo' '
	191	git push cloned $HASH6^:refs/heads/parallel &&
18a82692 JN	192	(
	193	cd clone_dir &&
	194	git checkout parallel &&
	195	git log --pretty=oneline \| grep $PARA2
fd4ec4f2	196	)
4e65b538 CC	197	'
	198
	199	test_expect_success 'push branch with replacement' '
	200	git cat-file commit $PARA3 \| grep "author A U Thor" &&
	201	S=$(git cat-file commit $PARA3 \| sed -e "s/A U/O/" \| git hash-object -t commit --stdin -w) &&
	202	git cat-file commit $S \| grep "author O Thor" &&
	203	git replace $PARA3 $S &&
	204	git show $HASH6~2 \| grep "O Thor" &&
	205	git show $PARA3 \| grep "O Thor" &&
	206	git push cloned $HASH6^:refs/heads/parallel2 &&
18a82692 JN	207	(
	208	cd clone_dir &&
	209	git checkout parallel2 &&
	210	git log --pretty=oneline \| grep $PARA3 &&
	211	git show $PARA3 \| grep "A U Thor"
fd4ec4f2	212	)
4e65b538 CC	213	'
	214
	215	test_expect_success 'fetch branch with replacement' '
	216	git branch tofetch $HASH6 &&
18a82692 JN	217	(
18a82692 JN	218	cd clone_dir &&
d212cef9 CC	219	git fetch origin refs/heads/tofetch:refs/heads/parallel3 &&
	220	git log --pretty=oneline parallel3 > output.txt &&
	221	! grep $PARA3 output.txt &&
	222	git show $PARA3 > para3.txt &&
	223	grep "A U Thor" para3.txt &&
	224	git fetch origin "refs/replace/:refs/replace/" &&
	225	git log --pretty=oneline parallel3 > output.txt &&
	226	grep $PARA3 output.txt &&
	227	git show $PARA3 > para3.txt &&
	228	grep "O Thor" para3.txt
fd4ec4f2	229	)
4e65b538 CC	230	'
4e65b538 CC	231
6476b38b CC	232	test_expect_success 'bisect and replacements' '
6476b38b CC	233	git bisect start $HASH7 $HASH1 &&
2e3400c0	234	test "$PARA3" = "$(git rev-parse --verify HEAD)" &&
6476b38b CC	235	git bisect reset &&
	236	GIT_NO_REPLACE_OBJECTS=1 git bisect start $HASH7 $HASH1 &&
	237	test "$HASH4" = "$(git rev-parse --verify HEAD)" &&
	238	git bisect reset &&
	239	git --no-replace-objects bisect start $HASH7 $HASH1 &&
	240	test "$HASH4" = "$(git rev-parse --verify HEAD)" &&
	241	git bisect reset
	242	'
	243
6e2a09d2 NE	244	test_expect_success 'index-pack and replacements' '
	245	git --no-replace-objects rev-list --objects HEAD \|
	246	git --no-replace-objects pack-objects test- &&
	247	git index-pack test-*.pack
	248	'
	249
abb25ac3 JH	250	test_expect_success 'not just commits' '
	251	echo replaced >file &&
	252	git add file &&
	253	REPLACED=$(git rev-parse :file) &&
	254	mv file file.replaced &&
	255
	256	echo original >file &&
	257	git add file &&
	258	ORIGINAL=$(git rev-parse :file) &&
	259	git update-ref refs/replace/$ORIGINAL $REPLACED &&
	260	mv file file.original &&
	261
	262	git checkout file &&
	263	test_cmp file.replaced file
	264	'
	265
3e625c8f CC	266	test_expect_success 'replaced and replacement objects must be of the same type' '
	267	test_must_fail git replace mytag $HASH1 &&
	268	test_must_fail git replace HEAD^{tree} HEAD~1 &&
	269	BLOB=$(git rev-parse :file) &&
	270	test_must_fail git replace HEAD^ $BLOB
	271	'
	272
	273	test_expect_success '-f option bypasses the type check' '
	274	git replace -f mytag $HASH1 &&
	275	git replace -f HEAD^{tree} HEAD~1 &&
	276	git replace -f HEAD^ $BLOB
	277	'
	278
a3e82672	279	test_done