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

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

. ./test-lib.sh
. "$TEST_DIRECTORY/lib-gpg.sh"

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

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

commit_buffer_contains_parents ()
{
    git cat-file commit "$1" >payload &&
    sed -n -e '/^$/q' -e '/^parent /p' <payload >actual &&
    shift &&
    for _parent
    do
	echo "parent $_parent"
    done >expected &&
    test_cmp expected actual
}

commit_peeling_shows_parents ()
{
    _parent_number=1
    _commit="$1"
    shift &&
    for _parent
    do
	_found=$(git rev-parse --verify $_commit^$_parent_number) || return 1
	test "$_found" = "$_parent" || return 1
	_parent_number=$(( $_parent_number + 1 ))
    done &&
    test_must_fail git rev-parse --verify $_commit^$_parent_number
}

commit_has_parents ()
{
    commit_buffer_contains_parents "$@" &&
    commit_peeling_shows_parents "$@"
}

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"
'

test_expect_success 'test core.usereplacerefs config option' '
	test_config core.usereplacerefs false &&
	git cat-file commit $HASH2 | grep "author A U Thor" &&
	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 &&
     test_i18ngrep "dangling commit $R" fsck_master.out &&
     test_i18ngrep "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 --list "$aa*")" &&
     test_must_fail git replace -d $R &&
     test_must_fail git replace --delete &&
     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 --force &&
     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 --force HEAD^{tree} HEAD~1 &&
	git replace -f HEAD^ $BLOB
'

test_expect_success 'git cat-file --batch works on replace objects' '
	git replace | grep $PARA3 &&
	echo $PARA3 | git cat-file --batch
'

test_expect_success 'test --format bogus' '
	test_must_fail git replace --format bogus >/dev/null 2>&1
'

test_expect_success 'test --format short' '
	git replace --format=short >actual &&
	git replace >expected &&
	test_cmp expected actual
'

test_expect_success 'test --format medium' '
	H1=$(git --no-replace-objects rev-parse HEAD~1) &&
	HT=$(git --no-replace-objects rev-parse HEAD^{tree}) &&
	MYTAG=$(git --no-replace-objects rev-parse mytag) &&
	{
		echo "$H1 -> $BLOB" &&
		echo "$BLOB -> $REPLACED" &&
		echo "$HT -> $H1" &&
		echo "$PARA3 -> $S" &&
		echo "$MYTAG -> $HASH1"
	} | sort >expected &&
	git replace -l --format medium | sort >actual &&
	test_cmp expected actual
'

test_expect_success 'test --format long' '
	{
		echo "$H1 (commit) -> $BLOB (blob)" &&
		echo "$BLOB (blob) -> $REPLACED (blob)" &&
		echo "$HT (tree) -> $H1 (commit)" &&
		echo "$PARA3 (commit) -> $S (commit)" &&
		echo "$MYTAG (tag) -> $HASH1 (commit)"
	} | sort >expected &&
	git replace --format=long | sort >actual &&
	test_cmp expected actual
'

test_expect_success 'setup fake editors' '
	write_script fakeeditor <<-\EOF &&
		sed -e "s/A U Thor/A fake Thor/" "$1" >"$1.new"
		mv "$1.new" "$1"
	EOF
	write_script failingfakeeditor <<-\EOF
		./fakeeditor "$@"
		false
	EOF
'

test_expect_success '--edit with and without already replaced object' '
	test_must_fail env GIT_EDITOR=./fakeeditor git replace --edit "$PARA3" &&
	GIT_EDITOR=./fakeeditor git replace --force --edit "$PARA3" &&
	git replace -l | grep "$PARA3" &&
	git cat-file commit "$PARA3" | grep "A fake Thor" &&
	git replace -d "$PARA3" &&
	GIT_EDITOR=./fakeeditor git replace --edit "$PARA3" &&
	git replace -l | grep "$PARA3" &&
	git cat-file commit "$PARA3" | grep "A fake Thor"
'

test_expect_success '--edit and change nothing or command failed' '
	git replace -d "$PARA3" &&
	test_must_fail env GIT_EDITOR=true git replace --edit "$PARA3" &&
	test_must_fail env GIT_EDITOR="./failingfakeeditor" git replace --edit "$PARA3" &&
	GIT_EDITOR=./fakeeditor git replace --edit "$PARA3" &&
	git replace -l | grep "$PARA3" &&
	git cat-file commit "$PARA3" | grep "A fake Thor"
'

test_expect_success 'replace ref cleanup' '
	test -n "$(git replace)" &&
	git replace -d $(git replace) &&
	test -z "$(git replace)"
'

test_expect_success '--graft with and without already replaced object' '
	test $(git log --oneline | wc -l) = 7 &&
	git replace --graft $HASH5 &&
	test $(git log --oneline | wc -l) = 3 &&
	commit_has_parents $HASH5 &&
	test_must_fail git replace --graft $HASH5 $HASH4 $HASH3 &&
	git replace --force -g $HASH5 $HASH4 $HASH3 &&
	commit_has_parents $HASH5 $HASH4 $HASH3 &&
	git replace -d $HASH5
'

test_expect_success GPG 'set up a signed commit' '
	echo "line 17" >>hello &&
	echo "line 18" >>hello &&
	git add hello &&
	test_tick &&
	git commit --quiet -S -m "hello: 2 more lines in a signed commit" &&
	HASH8=$(git rev-parse --verify HEAD) &&
	git verify-commit $HASH8
'

test_expect_success GPG '--graft with a signed commit' '
	git cat-file commit $HASH8 >orig &&
	git replace --graft $HASH8 &&
	git cat-file commit $HASH8 >repl &&
	commit_has_parents $HASH8 &&
	test_must_fail git verify-commit $HASH8 &&
	sed -n -e "/^tree /p" -e "/^author /p" -e "/^committer /p" orig >expected &&
	echo >>expected &&
	sed -e "/^$/q" repl >actual &&
	test_cmp expected actual &&
	git replace -d $HASH8
'

test_expect_success GPG 'set up a merge commit with a mergetag' '
	git reset --hard HEAD &&
	git checkout -b test_branch HEAD~2 &&
	echo "line 1 from test branch" >>hello &&
	echo "line 2 from test branch" >>hello &&
	git add hello &&
	test_tick &&
	git commit -m "hello: 2 more lines from a test branch" &&
	HASH9=$(git rev-parse --verify HEAD) &&
	git tag -s -m "tag for testing with a mergetag" test_tag HEAD &&
	git checkout master &&
	git merge -s ours test_tag &&
	HASH10=$(git rev-parse --verify HEAD) &&
	git cat-file commit $HASH10 | grep "^mergetag object"
'

test_expect_success GPG '--graft on a commit with a mergetag' '
	test_must_fail git replace --graft $HASH10 $HASH8^1 &&
	git replace --graft $HASH10 $HASH8^1 $HASH9 &&
	git replace -d $HASH10
'

test_expect_success '--convert-graft-file' '
	git checkout -b with-graft-file &&
	test_commit root2 &&
	git reset --hard root2^ &&
	test_commit root1 &&
	test_commit after-root1 &&
	test_tick &&
	git merge -m merge-root2 root2 &&

	: add and convert graft file &&
	printf "%s\n%s %s\n\n# comment\n%s\n" \
		$(git rev-parse HEAD^^ HEAD^ HEAD^^ HEAD^2) \
		>.git/info/grafts &&
	git status 2>stderr &&
	test_i18ngrep "hint:.*grafts is deprecated" stderr &&
	git replace --convert-graft-file 2>stderr &&
	test_i18ngrep ! "hint:.*grafts is deprecated" stderr &&
	test_path_is_missing .git/info/grafts &&

	: verify that the history is now "grafted" &&
	git rev-list HEAD >out &&
	test_line_count = 4 out &&

	: create invalid graft file and verify that it is not deleted &&
	test_when_finished "rm -f .git/info/grafts" &&
	echo $EMPTY_BLOB $EMPTY_TREE >.git/info/grafts &&
	test_must_fail git replace --convert-graft-file 2>err &&
	test_i18ngrep "$EMPTY_BLOB $EMPTY_TREE" err &&
	test_i18ngrep "$EMPTY_BLOB $EMPTY_TREE" .git/info/grafts
'

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
a3e82672	7	. ./test-lib.sh
60e2f5a5	8	. "$TEST_DIRECTORY/lib-gpg.sh"
a3e82672	9
adf8e542	10	add_and_commit_file ()
a3e82672 CC	11	{
	12	_file="$1"
	13	_msg="$2"
	14
	15	git add $_file \|\| return $?
	16	test_tick \|\| return $?
	17	git commit --quiet -m "$_file: $_msg"
	18	}
	19
adf8e542 CC	20	commit_buffer_contains_parents ()
	21	{
	22	git cat-file commit "$1" >payload &&
	23	sed -n -e '/^$/q' -e '/^parent /p' <payload >actual &&
	24	shift &&
	25	for _parent
	26	do
	27	echo "parent $_parent"
	28	done >expected &&
	29	test_cmp expected actual
	30	}
	31
	32	commit_peeling_shows_parents ()
	33	{
	34	_parent_number=1
	35	_commit="$1"
	36	shift &&
	37	for _parent
	38	do
	39	_found=$(git rev-parse --verify $_commit^$_parent_number) \|\| return 1
	40	test "$_found" = "$_parent" \|\| return 1
	41	_parent_number=$(( $_parent_number + 1 ))
	42	done &&
	43	test_must_fail git rev-parse --verify $_commit^$_parent_number
	44	}
	45
	46	commit_has_parents ()
	47	{
	48	commit_buffer_contains_parents "$@" &&
	49	commit_peeling_shows_parents "$@"
	50	}
	51
a3e82672 CC	52	HASH1=
	53	HASH2=
	54	HASH3=
	55	HASH4=
	56	HASH5=
	57	HASH6=
	58	HASH7=
	59
	60	test_expect_success 'set up buggy branch' '
1c2828c1 CC	61	echo "line 1" >>hello &&
	62	echo "line 2" >>hello &&
	63	echo "line 3" >>hello &&
	64	echo "line 4" >>hello &&
a3e82672 CC	65	add_and_commit_file hello "4 lines" &&
a3e82672 CC	66	HASH1=$(git rev-parse --verify HEAD) &&
1c2828c1 CC	67	echo "line BUG" >>hello &&
	68	echo "line 6" >>hello &&
	69	echo "line 7" >>hello &&
	70	echo "line 8" >>hello &&
a3e82672 CC	71	add_and_commit_file hello "4 more lines with a BUG" &&
a3e82672 CC	72	HASH2=$(git rev-parse --verify HEAD) &&
1c2828c1 CC	73	echo "line 9" >>hello &&
1c2828c1 CC	74	echo "line 10" >>hello &&
a3e82672 CC	75	add_and_commit_file hello "2 more lines" &&
a3e82672 CC	76	HASH3=$(git rev-parse --verify HEAD) &&
1c2828c1	77	echo "line 11" >>hello &&
a3e82672 CC	78	add_and_commit_file hello "1 more line" &&
a3e82672 CC	79	HASH4=$(git rev-parse --verify HEAD) &&
1c2828c1	80	sed -e "s/BUG/5/" hello >hello.new &&
a3e82672 CC	81	mv hello.new hello &&
	82	add_and_commit_file hello "BUG fixed" &&
	83	HASH5=$(git rev-parse --verify HEAD) &&
1c2828c1 CC	84	echo "line 12" >>hello &&
1c2828c1 CC	85	echo "line 13" >>hello &&
a3e82672	86	add_and_commit_file hello "2 more lines" &&
a48fcd83	87	HASH6=$(git rev-parse --verify HEAD) &&
1c2828c1 CC	88	echo "line 14" >>hello &&
	89	echo "line 15" >>hello &&
	90	echo "line 16" >>hello &&
a3e82672 CC	91	add_and_commit_file hello "again 3 more lines" &&
	92	HASH7=$(git rev-parse --verify HEAD)
	93	'
	94
	95	test_expect_success 'replace the author' '
	96	git cat-file commit $HASH2 \| grep "author A U Thor" &&
	97	R=$(git cat-file commit $HASH2 \| sed -e "s/A U/O/" \| git hash-object -t commit --stdin -w) &&
	98	git cat-file commit $R \| grep "author O Thor" &&
	99	git update-ref refs/replace/$HASH2 $R &&
	100	git show HEAD~5 \| grep "O Thor" &&
	101	git show $HASH2 \| grep "O Thor"
	102	'
	103
b0fa7ab5 CC	104	test_expect_success 'test --no-replace-objects option' '
	105	git cat-file commit $HASH2 \| grep "author O Thor" &&
	106	git --no-replace-objects cat-file commit $HASH2 \| grep "author A U Thor" &&
	107	git show $HASH2 \| grep "O Thor" &&
	108	git --no-replace-objects show $HASH2 \| grep "A U Thor"
	109	'
	110
6476b38b CC	111	test_expect_success 'test GIT_NO_REPLACE_OBJECTS env variable' '
	112	GIT_NO_REPLACE_OBJECTS=1 git cat-file commit $HASH2 \| grep "author A U Thor" &&
	113	GIT_NO_REPLACE_OBJECTS=1 git show $HASH2 \| grep "A U Thor"
	114	'
	115
da4398d6 JK	116	test_expect_success 'test core.usereplacerefs config option' '
	117	test_config core.usereplacerefs false &&
	118	git cat-file commit $HASH2 \| grep "author A U Thor" &&
	119	git show $HASH2 \| grep "A U Thor"
	120	'
	121
cc400f50 CC	122	cat >tag.sig <<EOF
	123	object $HASH2
	124	type commit
	125	tag mytag
	126	tagger T A Gger <> 0 +0000
	127
	128	EOF
	129
	130	test_expect_success 'tag replaced commit' '
	131	git mktag <tag.sig >.git/refs/tags/mytag 2>message
	132	'
	133
dae556bd	134	test_expect_success '"git fsck" works' '
1c2828c1	135	git fsck master >fsck_master.out &&
674ba340 NTND	136	test_i18ngrep "dangling commit $R" fsck_master.out &&
674ba340 NTND	137	test_i18ngrep "dangling tag $(cat .git/refs/tags/mytag)" fsck_master.out &&
dae556bd CC	138	test -z "$(git fsck)"
	139	'
	140
	141	test_expect_success 'repack, clone and fetch work' '
	142	git repack -a -d &&
	143	git clone --no-hardlinks . clone_dir &&
18a82692 JN	144	(
	145	cd clone_dir &&
	146	git show HEAD~5 \| grep "A U Thor" &&
	147	git show $HASH2 \| grep "A U Thor" &&
	148	git cat-file commit $R &&
	149	git repack -a -d &&
	150	test_must_fail git cat-file commit $R &&
	151	git fetch ../ "refs/replace/:refs/replace/" &&
	152	git show HEAD~5 \| grep "O Thor" &&
	153	git show $HASH2 \| grep "O Thor" &&
	154	git cat-file commit $R
fd4ec4f2	155	)
dae556bd CC	156	'
dae556bd CC	157
54b0c1e0 CC	158	test_expect_success '"git replace" listing and deleting' '
	159	test "$HASH2" = "$(git replace -l)" &&
	160	test "$HASH2" = "$(git replace)" &&
	161	aa=${HASH2%??????????????????????????????????????} &&
b1ecd8cf	162	test "$HASH2" = "$(git replace --list "$aa*")" &&
54b0c1e0	163	test_must_fail git replace -d $R &&
b1ecd8cf	164	test_must_fail git replace --delete &&
54b0c1e0 CC	165	test_must_fail git replace -l -d $HASH2 &&
54b0c1e0 CC	166	git replace -d $HASH2 &&
bebdd271	167	git show $HASH2 \| grep "A U Thor" &&
54b0c1e0 CC	168	test -z "$(git replace -l)"
	169	'
	170
bebdd271 CC	171	test_expect_success '"git replace" replacing' '
	172	git replace $HASH2 $R &&
	173	git show $HASH2 \| grep "O Thor" &&
	174	test_must_fail git replace $HASH2 $R &&
	175	git replace -f $HASH2 $R &&
	176	test_must_fail git replace -f &&
	177	test "$HASH2" = "$(git replace)"
	178	'
	179
9dfc3684 MG	180	test_expect_success '"git replace" resolves sha1' '
	181	SHORTHASH2=$(git rev-parse --short=8 $HASH2) &&
	182	git replace -d $SHORTHASH2 &&
	183	git replace $SHORTHASH2 $R &&
	184	git show $HASH2 \| grep "O Thor" &&
	185	test_must_fail git replace $HASH2 $R &&
	186	git replace -f $HASH2 $R &&
b1ecd8cf	187	test_must_fail git replace --force &&
9dfc3684 MG	188	test "$HASH2" = "$(git replace)"
	189	'
	190
4e65b538 CC	191	# This creates a side branch where the bug in H2
	192	# does not appear because P2 is created by applying
	193	# H2 and squashing H5 into it.
	194	# P3, P4 and P6 are created by cherry-picking H3, H4
	195	# and H6 respectively.
	196	#
	197	# At this point, we should have the following:
	198	#
	199	# P2--P3--P4--P6
	200	# /
	201	# H1-H2-H3-H4-H5-H6-H7
	202	#
	203	# Then we replace H6 with P6.
	204	#
	205	test_expect_success 'create parallel branch without the bug' '
	206	git replace -d $HASH2 &&
	207	git show $HASH2 \| grep "A U Thor" &&
	208	git checkout $HASH1 &&
	209	git cherry-pick $HASH2 &&
	210	git show $HASH5 \| git apply &&
	211	git commit --amend -m "hello: 4 more lines WITHOUT the bug" hello &&
	212	PARA2=$(git rev-parse --verify HEAD) &&
	213	git cherry-pick $HASH3 &&
	214	PARA3=$(git rev-parse --verify HEAD) &&
	215	git cherry-pick $HASH4 &&
	216	PARA4=$(git rev-parse --verify HEAD) &&
	217	git cherry-pick $HASH6 &&
	218	PARA6=$(git rev-parse --verify HEAD) &&
	219	git replace $HASH6 $PARA6 &&
	220	git checkout master &&
	221	cur=$(git rev-parse --verify HEAD) &&
	222	test "$cur" = "$HASH7" &&
	223	git log --pretty=oneline \| grep $PARA2 &&
	224	git remote add cloned ./clone_dir
	225	'
	226
	227	test_expect_success 'push to cloned repo' '
	228	git push cloned $HASH6^:refs/heads/parallel &&
18a82692 JN	229	(
	230	cd clone_dir &&
	231	git checkout parallel &&
	232	git log --pretty=oneline \| grep $PARA2
fd4ec4f2	233	)
4e65b538 CC	234	'
	235
	236	test_expect_success 'push branch with replacement' '
	237	git cat-file commit $PARA3 \| grep "author A U Thor" &&
	238	S=$(git cat-file commit $PARA3 \| sed -e "s/A U/O/" \| git hash-object -t commit --stdin -w) &&
	239	git cat-file commit $S \| grep "author O Thor" &&
	240	git replace $PARA3 $S &&
	241	git show $HASH6~2 \| grep "O Thor" &&
	242	git show $PARA3 \| grep "O Thor" &&
	243	git push cloned $HASH6^:refs/heads/parallel2 &&
18a82692 JN	244	(
	245	cd clone_dir &&
	246	git checkout parallel2 &&
	247	git log --pretty=oneline \| grep $PARA3 &&
	248	git show $PARA3 \| grep "A U Thor"
fd4ec4f2	249	)
4e65b538 CC	250	'
	251
	252	test_expect_success 'fetch branch with replacement' '
	253	git branch tofetch $HASH6 &&
18a82692 JN	254	(
18a82692 JN	255	cd clone_dir &&
d212cef9	256	git fetch origin refs/heads/tofetch:refs/heads/parallel3 &&
1c2828c1	257	git log --pretty=oneline parallel3 >output.txt &&
d212cef9	258	! grep $PARA3 output.txt &&
1c2828c1	259	git show $PARA3 >para3.txt &&
d212cef9 CC	260	grep "A U Thor" para3.txt &&
d212cef9 CC	261	git fetch origin "refs/replace/:refs/replace/" &&
1c2828c1	262	git log --pretty=oneline parallel3 >output.txt &&
d212cef9	263	grep $PARA3 output.txt &&
1c2828c1	264	git show $PARA3 >para3.txt &&
d212cef9	265	grep "O Thor" para3.txt
fd4ec4f2	266	)
4e65b538 CC	267	'
4e65b538 CC	268
6476b38b CC	269	test_expect_success 'bisect and replacements' '
6476b38b CC	270	git bisect start $HASH7 $HASH1 &&
2e3400c0	271	test "$PARA3" = "$(git rev-parse --verify HEAD)" &&
6476b38b CC	272	git bisect reset &&
	273	GIT_NO_REPLACE_OBJECTS=1 git bisect start $HASH7 $HASH1 &&
	274	test "$HASH4" = "$(git rev-parse --verify HEAD)" &&
	275	git bisect reset &&
	276	git --no-replace-objects bisect start $HASH7 $HASH1 &&
	277	test "$HASH4" = "$(git rev-parse --verify HEAD)" &&
	278	git bisect reset
	279	'
	280
6e2a09d2 NE	281	test_expect_success 'index-pack and replacements' '
	282	git --no-replace-objects rev-list --objects HEAD \|
	283	git --no-replace-objects pack-objects test- &&
	284	git index-pack test-*.pack
	285	'
	286
abb25ac3 JH	287	test_expect_success 'not just commits' '
	288	echo replaced >file &&
	289	git add file &&
	290	REPLACED=$(git rev-parse :file) &&
	291	mv file file.replaced &&
	292
	293	echo original >file &&
	294	git add file &&
	295	ORIGINAL=$(git rev-parse :file) &&
	296	git update-ref refs/replace/$ORIGINAL $REPLACED &&
	297	mv file file.original &&
	298
	299	git checkout file &&
	300	test_cmp file.replaced file
	301	'
	302
3e625c8f CC	303	test_expect_success 'replaced and replacement objects must be of the same type' '
	304	test_must_fail git replace mytag $HASH1 &&
	305	test_must_fail git replace HEAD^{tree} HEAD~1 &&
	306	BLOB=$(git rev-parse :file) &&
	307	test_must_fail git replace HEAD^ $BLOB
	308	'
	309
	310	test_expect_success '-f option bypasses the type check' '
	311	git replace -f mytag $HASH1 &&
b1ecd8cf	312	git replace --force HEAD^{tree} HEAD~1 &&
3e625c8f CC	313	git replace -f HEAD^ $BLOB
	314	'
	315
1f7117ef	316	test_expect_success 'git cat-file --batch works on replace objects' '
303c5d65 CC	317	git replace \| grep $PARA3 &&
	318	echo $PARA3 \| git cat-file --batch
	319	'
	320
bbbb4afc CC	321	test_expect_success 'test --format bogus' '
	322	test_must_fail git replace --format bogus >/dev/null 2>&1
	323	'
	324
	325	test_expect_success 'test --format short' '
	326	git replace --format=short >actual &&
	327	git replace >expected &&
	328	test_cmp expected actual
	329	'
	330
	331	test_expect_success 'test --format medium' '
	332	H1=$(git --no-replace-objects rev-parse HEAD~1) &&
	333	HT=$(git --no-replace-objects rev-parse HEAD^{tree}) &&
	334	MYTAG=$(git --no-replace-objects rev-parse mytag) &&
	335	{
	336	echo "$H1 -> $BLOB" &&
	337	echo "$BLOB -> $REPLACED" &&
	338	echo "$HT -> $H1" &&
	339	echo "$PARA3 -> $S" &&
	340	echo "$MYTAG -> $HASH1"
	341	} \| sort >expected &&
1c2828c1	342	git replace -l --format medium \| sort >actual &&
bbbb4afc CC	343	test_cmp expected actual
	344	'
	345
663a8566	346	test_expect_success 'test --format long' '
bbbb4afc CC	347	{
	348	echo "$H1 (commit) -> $BLOB (blob)" &&
	349	echo "$BLOB (blob) -> $REPLACED (blob)" &&
	350	echo "$HT (tree) -> $H1 (commit)" &&
	351	echo "$PARA3 (commit) -> $S (commit)" &&
	352	echo "$MYTAG (tag) -> $HASH1 (commit)"
	353	} \| sort >expected &&
1c2828c1	354	git replace --format=long \| sort >actual &&
bbbb4afc CC	355	test_cmp expected actual
	356	'
	357
36fc7d8a SG	358	test_expect_success 'setup fake editors' '
36fc7d8a SG	359	write_script fakeeditor <<-\EOF &&
85f98fc0 CC	360	sed -e "s/A U Thor/A fake Thor/" "$1" >"$1.new"
	361	mv "$1.new" "$1"
	362	EOF
36fc7d8a SG	363	write_script failingfakeeditor <<-\EOF
	364	./fakeeditor "$@"
	365	false
	366	EOF
85f98fc0 CC	367	'
	368
	369	test_expect_success '--edit with and without already replaced object' '
	370	test_must_fail env GIT_EDITOR=./fakeeditor git replace --edit "$PARA3" &&
	371	GIT_EDITOR=./fakeeditor git replace --force --edit "$PARA3" &&
	372	git replace -l \| grep "$PARA3" &&
	373	git cat-file commit "$PARA3" \| grep "A fake Thor" &&
	374	git replace -d "$PARA3" &&
	375	GIT_EDITOR=./fakeeditor git replace --edit "$PARA3" &&
	376	git replace -l \| grep "$PARA3" &&
	377	git cat-file commit "$PARA3" \| grep "A fake Thor"
	378	'
	379
	380	test_expect_success '--edit and change nothing or command failed' '
	381	git replace -d "$PARA3" &&
	382	test_must_fail env GIT_EDITOR=true git replace --edit "$PARA3" &&
36fc7d8a	383	test_must_fail env GIT_EDITOR="./failingfakeeditor" git replace --edit "$PARA3" &&
85f98fc0 CC	384	GIT_EDITOR=./fakeeditor git replace --edit "$PARA3" &&
	385	git replace -l \| grep "$PARA3" &&
	386	git cat-file commit "$PARA3" \| grep "A fake Thor"
	387	'
	388
11aec955 CC	389	test_expect_success 'replace ref cleanup' '
	390	test -n "$(git replace)" &&
	391	git replace -d $(git replace) &&
	392	test -z "$(git replace)"
	393	'
	394
adf8e542 CC	395	test_expect_success '--graft with and without already replaced object' '
	396	test $(git log --oneline \| wc -l) = 7 &&
	397	git replace --graft $HASH5 &&
	398	test $(git log --oneline \| wc -l) = 3 &&
	399	commit_has_parents $HASH5 &&
	400	test_must_fail git replace --graft $HASH5 $HASH4 $HASH3 &&
	401	git replace --force -g $HASH5 $HASH4 $HASH3 &&
	402	commit_has_parents $HASH5 $HASH4 $HASH3 &&
	403	git replace -d $HASH5
	404	'
	405
60e2f5a5 CC	406	test_expect_success GPG 'set up a signed commit' '
	407	echo "line 17" >>hello &&
	408	echo "line 18" >>hello &&
	409	git add hello &&
	410	test_tick &&
	411	git commit --quiet -S -m "hello: 2 more lines in a signed commit" &&
	412	HASH8=$(git rev-parse --verify HEAD) &&
	413	git verify-commit $HASH8
	414	'
	415
	416	test_expect_success GPG '--graft with a signed commit' '
	417	git cat-file commit $HASH8 >orig &&
	418	git replace --graft $HASH8 &&
	419	git cat-file commit $HASH8 >repl &&
	420	commit_has_parents $HASH8 &&
	421	test_must_fail git verify-commit $HASH8 &&
	422	sed -n -e "/^tree /p" -e "/^author /p" -e "/^committer /p" orig >expected &&
	423	echo >>expected &&
	424	sed -e "/^$/q" repl >actual &&
	425	test_cmp expected actual &&
	426	git replace -d $HASH8
	427	'
	428
3fa10259 CC	429	test_expect_success GPG 'set up a merge commit with a mergetag' '
	430	git reset --hard HEAD &&
	431	git checkout -b test_branch HEAD~2 &&
	432	echo "line 1 from test branch" >>hello &&
	433	echo "line 2 from test branch" >>hello &&
	434	git add hello &&
	435	test_tick &&
	436	git commit -m "hello: 2 more lines from a test branch" &&
	437	HASH9=$(git rev-parse --verify HEAD) &&
	438	git tag -s -m "tag for testing with a mergetag" test_tag HEAD &&
	439	git checkout master &&
	440	git merge -s ours test_tag &&
	441	HASH10=$(git rev-parse --verify HEAD) &&
	442	git cat-file commit $HASH10 \| grep "^mergetag object"
	443	'
	444
	445	test_expect_success GPG '--graft on a commit with a mergetag' '
	446	test_must_fail git replace --graft $HASH10 $HASH8^1 &&
	447	git replace --graft $HASH10 $HASH8^1 $HASH9 &&
	448	git replace -d $HASH10
	449	'
	450
0115e030 JS	451	test_expect_success '--convert-graft-file' '
	452	git checkout -b with-graft-file &&
	453	test_commit root2 &&
	454	git reset --hard root2^ &&
	455	test_commit root1 &&
	456	test_commit after-root1 &&
	457	test_tick &&
	458	git merge -m merge-root2 root2 &&
	459
	460	: add and convert graft file &&
	461	printf "%s\n%s %s\n\n# comment\n%s\n" \
	462	$(git rev-parse HEAD^^ HEAD^ HEAD^^ HEAD^2) \
	463	>.git/info/grafts &&
8821e90a ÆAB	464	git status 2>stderr &&
	465	test_i18ngrep "hint:.*grafts is deprecated" stderr &&
	466	git replace --convert-graft-file 2>stderr &&
	467	test_i18ngrep ! "hint:.*grafts is deprecated" stderr &&
0115e030 JS	468	test_path_is_missing .git/info/grafts &&
	469
	470	: verify that the history is now "grafted" &&
	471	git rev-list HEAD >out &&
	472	test_line_count = 4 out &&
	473
	474	: create invalid graft file and verify that it is not deleted &&
	475	test_when_finished "rm -f .git/info/grafts" &&
	476	echo $EMPTY_BLOB $EMPTY_TREE >.git/info/grafts &&
	477	test_must_fail git replace --convert-graft-file 2>err &&
	478	test_i18ngrep "$EMPTY_BLOB $EMPTY_TREE" err &&
	479	test_i18ngrep "$EMPTY_BLOB $EMPTY_TREE" .git/info/grafts
	480	'
	481
a3e82672	482	test_done