[thirdparty/git.git] / t / t3510-cherry-pick-sequence.sh

#!/bin/sh

test_description='Test cherry-pick continuation features

 +  conflicting: rewrites unrelated to conflicting
  + yetanotherpick: rewrites foo to e
  + anotherpick: rewrites foo to d
  + picked: rewrites foo to c
  + unrelatedpick: rewrites unrelated to reallyunrelated
  + base: rewrites foo to b
  + initial: writes foo as a, unrelated as unrelated

'

. ./test-lib.sh

# Repeat first match 10 times
_r10='\1\1\1\1\1\1\1\1\1\1'

pristine_detach () {
	git cherry-pick --quit &&
	git checkout -f "$1^0" &&
	git read-tree -u --reset HEAD &&
	git clean -d -f -f -q -x
}

test_expect_success setup '
	git config advice.detachedhead false &&
	echo unrelated >unrelated &&
	git add unrelated &&
	test_commit initial foo a &&
	test_commit base foo b &&
	test_commit unrelatedpick unrelated reallyunrelated &&
	test_commit picked foo c &&
	test_commit anotherpick foo d &&
	test_commit yetanotherpick foo e &&
	pristine_detach initial &&
	test_commit conflicting unrelated
'

test_expect_success 'cherry-pick persists data on failure' '
	pristine_detach initial &&
	test_expect_code 1 git cherry-pick -s base..anotherpick &&
	test_path_is_dir .git/sequencer &&
	test_path_is_file .git/sequencer/head &&
	test_path_is_file .git/sequencer/todo &&
	test_path_is_file .git/sequencer/opts
'

test_expect_success 'cherry-pick mid-cherry-pick-sequence' '
	pristine_detach initial &&
	test_must_fail git cherry-pick base..anotherpick &&
	test_cmp_rev picked CHERRY_PICK_HEAD &&
	# "oops, I forgot that these patches rely on the change from base"
	git checkout HEAD foo &&
	git cherry-pick base &&
	git cherry-pick picked &&
	git cherry-pick --continue &&
	git diff --exit-code anotherpick
'

test_expect_success 'cherry-pick persists opts correctly' '
	pristine_detach initial &&
	test_expect_code 128 git cherry-pick -s -m 1 --strategy=recursive -X patience -X ours initial..anotherpick &&
	test_path_is_dir .git/sequencer &&
	test_path_is_file .git/sequencer/head &&
	test_path_is_file .git/sequencer/todo &&
	test_path_is_file .git/sequencer/opts &&
	echo "true" >expect &&
	git config --file=.git/sequencer/opts --get-all options.signoff >actual &&
	test_cmp expect actual &&
	echo "1" >expect &&
	git config --file=.git/sequencer/opts --get-all options.mainline >actual &&
	test_cmp expect actual &&
	echo "recursive" >expect &&
	git config --file=.git/sequencer/opts --get-all options.strategy >actual &&
	test_cmp expect actual &&
	cat >expect <<-\EOF &&
	patience
	ours
	EOF
	git config --file=.git/sequencer/opts --get-all options.strategy-option >actual &&
	test_cmp expect actual
'

test_expect_success 'cherry-pick cleans up sequencer state upon success' '
	pristine_detach initial &&
	git cherry-pick initial..picked &&
	test_path_is_missing .git/sequencer
'

test_expect_success '--quit does not complain when no cherry-pick is in progress' '
	pristine_detach initial &&
	git cherry-pick --quit
'

test_expect_success '--abort requires cherry-pick in progress' '
	pristine_detach initial &&
	test_must_fail git cherry-pick --abort
'

test_expect_success '--quit cleans up sequencer state' '
	pristine_detach initial &&
	test_expect_code 1 git cherry-pick base..picked &&
	git cherry-pick --quit &&
	test_path_is_missing .git/sequencer
'

test_expect_success '--quit keeps HEAD and conflicted index intact' '
	pristine_detach initial &&
	cat >expect <<-\EOF &&
	OBJID
	:100644 100644 OBJID OBJID M	unrelated
	OBJID
	:000000 100644 OBJID OBJID A	foo
	:000000 100644 OBJID OBJID A	unrelated
	EOF
	test_expect_code 1 git cherry-pick base..picked &&
	git cherry-pick --quit &&
	test_path_is_missing .git/sequencer &&
	test_must_fail git update-index --refresh &&
	{
		git rev-list HEAD |
		git diff-tree --root --stdin |
		sed "s/$_x40/OBJID/g"
	} >actual &&
	test_cmp expect actual
'

test_expect_success '--abort to cancel multiple cherry-pick' '
	pristine_detach initial &&
	test_expect_code 1 git cherry-pick base..anotherpick &&
	git cherry-pick --abort &&
	test_path_is_missing .git/sequencer &&
	test_cmp_rev initial HEAD &&
	git update-index --refresh &&
	git diff-index --exit-code HEAD
'

test_expect_success '--abort to cancel single cherry-pick' '
	pristine_detach initial &&
	test_expect_code 1 git cherry-pick picked &&
	git cherry-pick --abort &&
	test_path_is_missing .git/sequencer &&
	test_cmp_rev initial HEAD &&
	git update-index --refresh &&
	git diff-index --exit-code HEAD
'

test_expect_success '--abort does not unsafely change HEAD' '
	pristine_detach initial &&
	test_must_fail git cherry-pick picked anotherpick &&
	git reset --hard base &&
	test_must_fail git cherry-pick picked anotherpick &&
	git cherry-pick --abort 2>actual &&
	test_i18ngrep "You seem to have moved HEAD" actual &&
	test_cmp_rev base HEAD
'

test_expect_success 'cherry-pick --abort to cancel multiple revert' '
	pristine_detach anotherpick &&
	test_expect_code 1 git revert base..picked &&
	git cherry-pick --abort &&
	test_path_is_missing .git/sequencer &&
	test_cmp_rev anotherpick HEAD &&
	git update-index --refresh &&
	git diff-index --exit-code HEAD
'

test_expect_success 'revert --abort works, too' '
	pristine_detach anotherpick &&
	test_expect_code 1 git revert base..picked &&
	git revert --abort &&
	test_path_is_missing .git/sequencer &&
	test_cmp_rev anotherpick HEAD
'

test_expect_success '--abort to cancel single revert' '
	pristine_detach anotherpick &&
	test_expect_code 1 git revert picked &&
	git revert --abort &&
	test_path_is_missing .git/sequencer &&
	test_cmp_rev anotherpick HEAD &&
	git update-index --refresh &&
	git diff-index --exit-code HEAD
'

test_expect_success '--abort keeps unrelated change, easy case' '
	pristine_detach unrelatedpick &&
	echo changed >expect &&
	test_expect_code 1 git cherry-pick picked..yetanotherpick &&
	echo changed >unrelated &&
	git cherry-pick --abort &&
	test_cmp expect unrelated
'

test_expect_success '--abort refuses to clobber unrelated change, harder case' '
	pristine_detach initial &&
	echo changed >expect &&
	test_expect_code 1 git cherry-pick base..anotherpick &&
	echo changed >unrelated &&
	test_must_fail git cherry-pick --abort &&
	test_cmp expect unrelated &&
	git rev-list HEAD >log &&
	test_line_count = 2 log &&
	test_must_fail git update-index --refresh &&

	git checkout unrelated &&
	git cherry-pick --abort &&
	test_cmp_rev initial HEAD
'

test_expect_success 'cherry-pick still writes sequencer state when one commit is left' '
	pristine_detach initial &&
	test_expect_code 1 git cherry-pick base..picked &&
	test_path_is_dir .git/sequencer &&
	echo "resolved" >foo &&
	git add foo &&
	git commit &&
	{
		git rev-list HEAD |
		git diff-tree --root --stdin |
		sed "s/$_x40/OBJID/g"
	} >actual &&
	cat >expect <<-\EOF &&
	OBJID
	:100644 100644 OBJID OBJID M	foo
	OBJID
	:100644 100644 OBJID OBJID M	unrelated
	OBJID
	:000000 100644 OBJID OBJID A	foo
	:000000 100644 OBJID OBJID A	unrelated
	EOF
	test_cmp expect actual
'

test_expect_success '--abort after last commit in sequence' '
	pristine_detach initial &&
	test_expect_code 1 git cherry-pick base..picked &&
	git cherry-pick --abort &&
	test_path_is_missing .git/sequencer &&
	test_cmp_rev initial HEAD &&
	git update-index --refresh &&
	git diff-index --exit-code HEAD
'

test_expect_success 'cherry-pick does not implicitly stomp an existing operation' '
	pristine_detach initial &&
	test_expect_code 1 git cherry-pick base..anotherpick &&
	test-chmtime -v +0 .git/sequencer >expect &&
	test_expect_code 128 git cherry-pick unrelatedpick &&
	test-chmtime -v +0 .git/sequencer >actual &&
	test_cmp expect actual
'

test_expect_success '--continue complains when no cherry-pick is in progress' '
	pristine_detach initial &&
	test_expect_code 128 git cherry-pick --continue
'

test_expect_success '--continue complains when there are unresolved conflicts' '
	pristine_detach initial &&
	test_expect_code 1 git cherry-pick base..anotherpick &&
	test_expect_code 128 git cherry-pick --continue
'

test_expect_success '--continue of single cherry-pick' '
	pristine_detach initial &&
	echo c >expect &&
	test_must_fail git cherry-pick picked &&
	echo c >foo &&
	git add foo &&
	git cherry-pick --continue &&

	test_cmp expect foo &&
	test_cmp_rev initial HEAD^ &&
	git diff --exit-code HEAD &&
	test_must_fail git rev-parse --verify CHERRY_PICK_HEAD
'

test_expect_success '--continue of single revert' '
	pristine_detach initial &&
	echo resolved >expect &&
	echo "Revert \"picked\"" >expect.msg &&
	test_must_fail git revert picked &&
	echo resolved >foo &&
	git add foo &&
	git cherry-pick --continue &&

	git diff --exit-code HEAD &&
	test_cmp expect foo &&
	test_cmp_rev initial HEAD^ &&
	git diff-tree -s --pretty=tformat:%s HEAD >msg &&
	test_cmp expect.msg msg &&
	test_must_fail git rev-parse --verify CHERRY_PICK_HEAD &&
	test_must_fail git rev-parse --verify REVERT_HEAD
'

test_expect_success '--continue after resolving conflicts' '
	pristine_detach initial &&
	echo d >expect &&
	cat >expect.log <<-\EOF &&
	OBJID
	:100644 100644 OBJID OBJID M	foo
	OBJID
	:100644 100644 OBJID OBJID M	foo
	OBJID
	:100644 100644 OBJID OBJID M	unrelated
	OBJID
	:000000 100644 OBJID OBJID A	foo
	:000000 100644 OBJID OBJID A	unrelated
	EOF
	test_must_fail git cherry-pick base..anotherpick &&
	echo c >foo &&
	git add foo &&
	git cherry-pick --continue &&
	{
		git rev-list HEAD |
		git diff-tree --root --stdin |
		sed "s/$_x40/OBJID/g"
	} >actual.log &&
	test_cmp expect foo &&
	test_cmp expect.log actual.log
'

test_expect_success '--continue after resolving conflicts and committing' '
	pristine_detach initial &&
	test_expect_code 1 git cherry-pick base..anotherpick &&
	echo "c" >foo &&
	git add foo &&
	git commit &&
	git cherry-pick --continue &&
	test_path_is_missing .git/sequencer &&
	{
		git rev-list HEAD |
		git diff-tree --root --stdin |
		sed "s/$_x40/OBJID/g"
	} >actual &&
	cat >expect <<-\EOF &&
	OBJID
	:100644 100644 OBJID OBJID M	foo
	OBJID
	:100644 100644 OBJID OBJID M	foo
	OBJID
	:100644 100644 OBJID OBJID M	unrelated
	OBJID
	:000000 100644 OBJID OBJID A	foo
	:000000 100644 OBJID OBJID A	unrelated
	EOF
	test_cmp expect actual
'

test_expect_success '--continue asks for help after resolving patch to nil' '
	pristine_detach conflicting &&
	test_must_fail git cherry-pick initial..picked &&

	test_cmp_rev unrelatedpick CHERRY_PICK_HEAD &&
	git checkout HEAD -- unrelated &&
	test_must_fail git cherry-pick --continue 2>msg &&
	test_i18ngrep "The previous cherry-pick is now empty" msg
'

test_expect_success 'follow advice and skip nil patch' '
	pristine_detach conflicting &&
	test_must_fail git cherry-pick initial..picked &&

	git checkout HEAD -- unrelated &&
	test_must_fail git cherry-pick --continue &&
	git reset &&
	git cherry-pick --continue &&

	git rev-list initial..HEAD >commits &&
	test_line_count = 3 commits
'

test_expect_success '--continue respects opts' '
	pristine_detach initial &&
	test_expect_code 1 git cherry-pick -x base..anotherpick &&
	echo "c" >foo &&
	git add foo &&
	git commit &&
	git cherry-pick --continue &&
	test_path_is_missing .git/sequencer &&
	git cat-file commit HEAD >anotherpick_msg &&
	git cat-file commit HEAD~1 >picked_msg &&
	git cat-file commit HEAD~2 >unrelatedpick_msg &&
	git cat-file commit HEAD~3 >initial_msg &&
	! grep "cherry picked from" initial_msg &&
	grep "cherry picked from" unrelatedpick_msg &&
	grep "cherry picked from" picked_msg &&
	grep "cherry picked from" anotherpick_msg
'

test_expect_success '--continue of single-pick respects -x' '
	pristine_detach initial &&
	test_must_fail git cherry-pick -x picked &&
	echo c >foo &&
	git add foo &&
	git cherry-pick --continue &&
	test_path_is_missing .git/sequencer &&
	git cat-file commit HEAD >msg &&
	grep "cherry picked from" msg
'

test_expect_success '--continue respects -x in first commit in multi-pick' '
	pristine_detach initial &&
	test_must_fail git cherry-pick -x picked anotherpick &&
	echo c >foo &&
	git add foo &&
	git cherry-pick --continue &&
	test_path_is_missing .git/sequencer &&
	git cat-file commit HEAD^ >msg &&
	picked=$(git rev-parse --verify picked) &&
	grep "cherry picked from.*$picked" msg
'

test_expect_failure '--signoff is automatically propagated to resolved conflict' '
	pristine_detach initial &&
	test_expect_code 1 git cherry-pick --signoff base..anotherpick &&
	echo "c" >foo &&
	git add foo &&
	git commit &&
	git cherry-pick --continue &&
	test_path_is_missing .git/sequencer &&
	git cat-file commit HEAD >anotherpick_msg &&
	git cat-file commit HEAD~1 >picked_msg &&
	git cat-file commit HEAD~2 >unrelatedpick_msg &&
	git cat-file commit HEAD~3 >initial_msg &&
	! grep "Signed-off-by:" initial_msg &&
	grep "Signed-off-by:" unrelatedpick_msg &&
	! grep "Signed-off-by:" picked_msg &&
	grep "Signed-off-by:" anotherpick_msg
'

test_expect_failure '--signoff dropped for implicit commit of resolution, multi-pick case' '
	pristine_detach initial &&
	test_must_fail git cherry-pick -s picked anotherpick &&
	echo c >foo &&
	git add foo &&
	git cherry-pick --continue &&

	git diff --exit-code HEAD &&
	test_cmp_rev initial HEAD^^ &&
	git cat-file commit HEAD^ >msg &&
	! grep Signed-off-by: msg
'

test_expect_failure 'sign-off needs to be reaffirmed after conflict resolution, single-pick case' '
	pristine_detach initial &&
	test_must_fail git cherry-pick -s picked &&
	echo c >foo &&
	git add foo &&
	git cherry-pick --continue &&

	git diff --exit-code HEAD &&
	test_cmp_rev initial HEAD^ &&
	git cat-file commit HEAD >msg &&
	! grep Signed-off-by: msg
'

test_expect_success 'malformed instruction sheet 1' '
	pristine_detach initial &&
	test_expect_code 1 git cherry-pick base..anotherpick &&
	echo "resolved" >foo &&
	git add foo &&
	git commit &&
	sed "s/pick /pick/" .git/sequencer/todo >new_sheet &&
	cp new_sheet .git/sequencer/todo &&
	test_expect_code 128 git cherry-pick --continue
'

test_expect_success 'malformed instruction sheet 2' '
	pristine_detach initial &&
	test_expect_code 1 git cherry-pick base..anotherpick &&
	echo "resolved" >foo &&
	git add foo &&
	git commit &&
	sed "s/pick/revert/" .git/sequencer/todo >new_sheet &&
	cp new_sheet .git/sequencer/todo &&
	test_expect_code 128 git cherry-pick --continue
'

test_expect_success 'empty commit set' '
	pristine_detach initial &&
	test_expect_code 128 git cherry-pick base..base
'

test_expect_success 'malformed instruction sheet 3' '
	pristine_detach initial &&
	test_expect_code 1 git cherry-pick base..anotherpick &&
	echo "resolved" >foo &&
	git add foo &&
	git commit &&
	sed "s/pick \([0-9a-f]*\)/pick $_r10/" .git/sequencer/todo >new_sheet &&
	cp new_sheet .git/sequencer/todo &&
	test_expect_code 128 git cherry-pick --continue
'

test_expect_success 'instruction sheet, fat-fingers version' '
	pristine_detach initial &&
	test_expect_code 1 git cherry-pick base..anotherpick &&
	echo "c" >foo &&
	git add foo &&
	git commit &&
	sed "s/pick \([0-9a-f]*\)/pick 	 \1 	/" .git/sequencer/todo >new_sheet &&
	cp new_sheet .git/sequencer/todo &&
	git cherry-pick --continue
'

test_expect_success 'commit descriptions in insn sheet are optional' '
	pristine_detach initial &&
	test_expect_code 1 git cherry-pick base..anotherpick &&
	echo "c" >foo &&
	git add foo &&
	git commit &&
	cut -d" " -f1,2 .git/sequencer/todo >new_sheet &&
	cp new_sheet .git/sequencer/todo &&
	git cherry-pick --continue &&
	test_path_is_missing .git/sequencer &&
	git rev-list HEAD >commits &&
	test_line_count = 4 commits
'

test_done
Commit	Line	Data
04d3d3cf RR	1	#!/bin/sh
	2
	3	test_description='Test cherry-pick continuation features
	4
093a3091	5	+ conflicting: rewrites unrelated to conflicting
539047c1	6	+ yetanotherpick: rewrites foo to e
04d3d3cf RR	7	+ anotherpick: rewrites foo to d
	8	+ picked: rewrites foo to c
	9	+ unrelatedpick: rewrites unrelated to reallyunrelated
	10	+ base: rewrites foo to b
	11	+ initial: writes foo as a, unrelated as unrelated
	12
	13	'
	14
	15	. ./test-lib.sh
	16
6bc1a235 RR	17	# Repeat first match 10 times
	18	_r10='\1\1\1\1\1\1\1\1\1\1'
	19
04d3d3cf	20	pristine_detach () {
f80a8726	21	git cherry-pick --quit &&
04d3d3cf RR	22	git checkout -f "$1^0" &&
	23	git read-tree -u --reset HEAD &&
	24	git clean -d -f -f -q -x
	25	}
	26
	27	test_expect_success setup '
070bad6d	28	git config advice.detachedhead false &&
04d3d3cf RR	29	echo unrelated >unrelated &&
	30	git add unrelated &&
	31	test_commit initial foo a &&
	32	test_commit base foo b &&
	33	test_commit unrelatedpick unrelated reallyunrelated &&
	34	test_commit picked foo c &&
	35	test_commit anotherpick foo d &&
539047c1	36	test_commit yetanotherpick foo e &&
093a3091 JN	37	pristine_detach initial &&
093a3091 JN	38	test_commit conflicting unrelated
04d3d3cf RR	39	'
	40
	41	test_expect_success 'cherry-pick persists data on failure' '
	42	pristine_detach initial &&
c6b7c7f3	43	test_expect_code 1 git cherry-pick -s base..anotherpick &&
04d3d3cf RR	44	test_path_is_dir .git/sequencer &&
04d3d3cf RR	45	test_path_is_file .git/sequencer/head &&
6f032263 RR	46	test_path_is_file .git/sequencer/todo &&
	47	test_path_is_file .git/sequencer/opts
	48	'
	49
7acaaac2 JN	50	test_expect_success 'cherry-pick mid-cherry-pick-sequence' '
	51	pristine_detach initial &&
	52	test_must_fail git cherry-pick base..anotherpick &&
	53	test_cmp_rev picked CHERRY_PICK_HEAD &&
	54	# "oops, I forgot that these patches rely on the change from base"
	55	git checkout HEAD foo &&
	56	git cherry-pick base &&
	57	git cherry-pick picked &&
	58	git cherry-pick --continue &&
	59	git diff --exit-code anotherpick
	60	'
	61
6f032263 RR	62	test_expect_success 'cherry-pick persists opts correctly' '
6f032263 RR	63	pristine_detach initial &&
bf71009e	64	test_expect_code 128 git cherry-pick -s -m 1 --strategy=recursive -X patience -X ours initial..anotherpick &&
6f032263 RR	65	test_path_is_dir .git/sequencer &&
	66	test_path_is_file .git/sequencer/head &&
	67	test_path_is_file .git/sequencer/todo &&
	68	test_path_is_file .git/sequencer/opts &&
	69	echo "true" >expect &&
	70	git config --file=.git/sequencer/opts --get-all options.signoff >actual &&
	71	test_cmp expect actual &&
	72	echo "1" >expect &&
	73	git config --file=.git/sequencer/opts --get-all options.mainline >actual &&
	74	test_cmp expect actual &&
	75	echo "recursive" >expect &&
	76	git config --file=.git/sequencer/opts --get-all options.strategy >actual &&
	77	test_cmp expect actual &&
	78	cat >expect <<-\EOF &&
	79	patience
	80	ours
	81	EOF
	82	git config --file=.git/sequencer/opts --get-all options.strategy-option >actual &&
	83	test_cmp expect actual
04d3d3cf RR	84	'
	85
	86	test_expect_success 'cherry-pick cleans up sequencer state upon success' '
	87	pristine_detach initial &&
	88	git cherry-pick initial..picked &&
	89	test_path_is_missing .git/sequencer
	90	'
	91
f80a8726	92	test_expect_success '--quit does not complain when no cherry-pick is in progress' '
26ae337b	93	pristine_detach initial &&
f80a8726	94	git cherry-pick --quit
26ae337b RR	95	'
26ae337b RR	96
539047c1 JN	97	test_expect_success '--abort requires cherry-pick in progress' '
	98	pristine_detach initial &&
	99	test_must_fail git cherry-pick --abort
	100	'
	101
f80a8726	102	test_expect_success '--quit cleans up sequencer state' '
26ae337b	103	pristine_detach initial &&
c6b7c7f3	104	test_expect_code 1 git cherry-pick base..picked &&
f80a8726	105	git cherry-pick --quit &&
26ae337b RR	106	test_path_is_missing .git/sequencer
	107	'
	108
c427b211	109	test_expect_success '--quit keeps HEAD and conflicted index intact' '
f80a8726 JN	110	pristine_detach initial &&
	111	cat >expect <<-\EOF &&
	112	OBJID
	113	:100644 100644 OBJID OBJID M unrelated
	114	OBJID
	115	:000000 100644 OBJID OBJID A foo
	116	:000000 100644 OBJID OBJID A unrelated
	117	EOF
c6b7c7f3	118	test_expect_code 1 git cherry-pick base..picked &&
c427b211	119	git cherry-pick --quit &&
f80a8726 JN	120	test_path_is_missing .git/sequencer &&
	121	test_must_fail git update-index --refresh &&
	122	{
	123	git rev-list HEAD \|
	124	git diff-tree --root --stdin \|
	125	sed "s/$_x40/OBJID/g"
	126	} >actual &&
	127	test_cmp expect actual
	128	'
	129
539047c1 JN	130	test_expect_success '--abort to cancel multiple cherry-pick' '
539047c1 JN	131	pristine_detach initial &&
c6b7c7f3	132	test_expect_code 1 git cherry-pick base..anotherpick &&
539047c1 JN	133	git cherry-pick --abort &&
	134	test_path_is_missing .git/sequencer &&
	135	test_cmp_rev initial HEAD &&
	136	git update-index --refresh &&
	137	git diff-index --exit-code HEAD
	138	'
	139
	140	test_expect_success '--abort to cancel single cherry-pick' '
	141	pristine_detach initial &&
c6b7c7f3	142	test_expect_code 1 git cherry-pick picked &&
539047c1 JN	143	git cherry-pick --abort &&
	144	test_path_is_missing .git/sequencer &&
	145	test_cmp_rev initial HEAD &&
	146	git update-index --refresh &&
	147	git diff-index --exit-code HEAD
	148	'
	149
1e41229d	150	test_expect_success '--abort does not unsafely change HEAD' '
aeebd98e SB	151	pristine_detach initial &&
	152	test_must_fail git cherry-pick picked anotherpick &&
	153	git reset --hard base &&
	154	test_must_fail git cherry-pick picked anotherpick &&
	155	git cherry-pick --abort 2>actual &&
	156	test_i18ngrep "You seem to have moved HEAD" actual &&
	157	test_cmp_rev base HEAD
	158	'
	159
539047c1 JN	160	test_expect_success 'cherry-pick --abort to cancel multiple revert' '
539047c1 JN	161	pristine_detach anotherpick &&
c6b7c7f3	162	test_expect_code 1 git revert base..picked &&
539047c1 JN	163	git cherry-pick --abort &&
	164	test_path_is_missing .git/sequencer &&
	165	test_cmp_rev anotherpick HEAD &&
	166	git update-index --refresh &&
	167	git diff-index --exit-code HEAD
	168	'
	169
	170	test_expect_success 'revert --abort works, too' '
	171	pristine_detach anotherpick &&
c6b7c7f3	172	test_expect_code 1 git revert base..picked &&
539047c1 JN	173	git revert --abort &&
	174	test_path_is_missing .git/sequencer &&
	175	test_cmp_rev anotherpick HEAD
	176	'
	177
	178	test_expect_success '--abort to cancel single revert' '
	179	pristine_detach anotherpick &&
c6b7c7f3	180	test_expect_code 1 git revert picked &&
539047c1 JN	181	git revert --abort &&
	182	test_path_is_missing .git/sequencer &&
	183	test_cmp_rev anotherpick HEAD &&
	184	git update-index --refresh &&
	185	git diff-index --exit-code HEAD
	186	'
	187
	188	test_expect_success '--abort keeps unrelated change, easy case' '
	189	pristine_detach unrelatedpick &&
	190	echo changed >expect &&
c6b7c7f3	191	test_expect_code 1 git cherry-pick picked..yetanotherpick &&
539047c1 JN	192	echo changed >unrelated &&
	193	git cherry-pick --abort &&
	194	test_cmp expect unrelated
	195	'
	196
	197	test_expect_success '--abort refuses to clobber unrelated change, harder case' '
	198	pristine_detach initial &&
	199	echo changed >expect &&
c6b7c7f3	200	test_expect_code 1 git cherry-pick base..anotherpick &&
539047c1 JN	201	echo changed >unrelated &&
	202	test_must_fail git cherry-pick --abort &&
	203	test_cmp expect unrelated &&
	204	git rev-list HEAD >log &&
	205	test_line_count = 2 log &&
	206	test_must_fail git update-index --refresh &&
	207
	208	git checkout unrelated &&
	209	git cherry-pick --abort &&
	210	test_cmp_rev initial HEAD
	211	'
	212
218b65fb	213	test_expect_success 'cherry-pick still writes sequencer state when one commit is left' '
2d27daa9	214	pristine_detach initial &&
c6b7c7f3	215	test_expect_code 1 git cherry-pick base..picked &&
218b65fb	216	test_path_is_dir .git/sequencer &&
2d27daa9 RR	217	echo "resolved" >foo &&
	218	git add foo &&
	219	git commit &&
	220	{
	221	git rev-list HEAD \|
	222	git diff-tree --root --stdin \|
	223	sed "s/$_x40/OBJID/g"
	224	} >actual &&
	225	cat >expect <<-\EOF &&
	226	OBJID
	227	:100644 100644 OBJID OBJID M foo
	228	OBJID
	229	:100644 100644 OBJID OBJID M unrelated
	230	OBJID
	231	:000000 100644 OBJID OBJID A foo
	232	:000000 100644 OBJID OBJID A unrelated
	233	EOF
	234	test_cmp expect actual
	235	'
	236
218b65fb	237	test_expect_success '--abort after last commit in sequence' '
539047c1	238	pristine_detach initial &&
c6b7c7f3	239	test_expect_code 1 git cherry-pick base..picked &&
539047c1 JN	240	git cherry-pick --abort &&
	241	test_path_is_missing .git/sequencer &&
	242	test_cmp_rev initial HEAD &&
	243	git update-index --refresh &&
	244	git diff-index --exit-code HEAD
	245	'
	246
21afd080 RR	247	test_expect_success 'cherry-pick does not implicitly stomp an existing operation' '
21afd080 RR	248	pristine_detach initial &&
c6b7c7f3	249	test_expect_code 1 git cherry-pick base..anotherpick &&
21afd080	250	test-chmtime -v +0 .git/sequencer >expect &&
c6b7c7f3	251	test_expect_code 128 git cherry-pick unrelatedpick &&
21afd080 RR	252	test-chmtime -v +0 .git/sequencer >actual &&
	253	test_cmp expect actual
	254	'
	255
5a5d80f4 RR	256	test_expect_success '--continue complains when no cherry-pick is in progress' '
5a5d80f4 RR	257	pristine_detach initial &&
c6b7c7f3	258	test_expect_code 128 git cherry-pick --continue
5a5d80f4 RR	259	'
	260
	261	test_expect_success '--continue complains when there are unresolved conflicts' '
	262	pristine_detach initial &&
c6b7c7f3 RR	263	test_expect_code 1 git cherry-pick base..anotherpick &&
c6b7c7f3 RR	264	test_expect_code 128 git cherry-pick --continue
5a5d80f4 RR	265	'
5a5d80f4 RR	266
093a3091 JN	267	test_expect_success '--continue of single cherry-pick' '
	268	pristine_detach initial &&
	269	echo c >expect &&
	270	test_must_fail git cherry-pick picked &&
	271	echo c >foo &&
	272	git add foo &&
	273	git cherry-pick --continue &&
	274
	275	test_cmp expect foo &&
	276	test_cmp_rev initial HEAD^ &&
	277	git diff --exit-code HEAD &&
	278	test_must_fail git rev-parse --verify CHERRY_PICK_HEAD
	279	'
	280
	281	test_expect_success '--continue of single revert' '
	282	pristine_detach initial &&
	283	echo resolved >expect &&
	284	echo "Revert \"picked\"" >expect.msg &&
	285	test_must_fail git revert picked &&
	286	echo resolved >foo &&
	287	git add foo &&
	288	git cherry-pick --continue &&
	289
	290	git diff --exit-code HEAD &&
	291	test_cmp expect foo &&
	292	test_cmp_rev initial HEAD^ &&
	293	git diff-tree -s --pretty=tformat:%s HEAD >msg &&
	294	test_cmp expect.msg msg &&
	295	test_must_fail git rev-parse --verify CHERRY_PICK_HEAD &&
	296	test_must_fail git rev-parse --verify REVERT_HEAD
	297	'
	298
	299	test_expect_success '--continue after resolving conflicts' '
	300	pristine_detach initial &&
	301	echo d >expect &&
	302	cat >expect.log <<-\EOF &&
	303	OBJID
	304	:100644 100644 OBJID OBJID M foo
	305	OBJID
	306	:100644 100644 OBJID OBJID M foo
	307	OBJID
	308	:100644 100644 OBJID OBJID M unrelated
	309	OBJID
	310	:000000 100644 OBJID OBJID A foo
	311	:000000 100644 OBJID OBJID A unrelated
	312	EOF
	313	test_must_fail git cherry-pick base..anotherpick &&
	314	echo c >foo &&
	315	git add foo &&
	316	git cherry-pick --continue &&
	317	{
	318	git rev-list HEAD \|
	319	git diff-tree --root --stdin \|
	320	sed "s/$_x40/OBJID/g"
	321	} >actual.log &&
	322	test_cmp expect foo &&
	323	test_cmp expect.log actual.log
	324	'
	325
	326	test_expect_success '--continue after resolving conflicts and committing' '
5a5d80f4	327	pristine_detach initial &&
c6b7c7f3	328	test_expect_code 1 git cherry-pick base..anotherpick &&
5a5d80f4 RR	329	echo "c" >foo &&
	330	git add foo &&
	331	git commit &&
	332	git cherry-pick --continue &&
	333	test_path_is_missing .git/sequencer &&
	334	{
	335	git rev-list HEAD \|
	336	git diff-tree --root --stdin \|
	337	sed "s/$_x40/OBJID/g"
	338	} >actual &&
	339	cat >expect <<-\EOF &&
	340	OBJID
	341	:100644 100644 OBJID OBJID M foo
	342	OBJID
	343	:100644 100644 OBJID OBJID M foo
	344	OBJID
	345	:100644 100644 OBJID OBJID M unrelated
	346	OBJID
	347	:000000 100644 OBJID OBJID A foo
	348	:000000 100644 OBJID OBJID A unrelated
	349	EOF
	350	test_cmp expect actual
	351	'
	352
093a3091 JN	353	test_expect_success '--continue asks for help after resolving patch to nil' '
	354	pristine_detach conflicting &&
	355	test_must_fail git cherry-pick initial..picked &&
	356
	357	test_cmp_rev unrelatedpick CHERRY_PICK_HEAD &&
	358	git checkout HEAD -- unrelated &&
	359	test_must_fail git cherry-pick --continue 2>msg &&
	360	test_i18ngrep "The previous cherry-pick is now empty" msg
	361	'
	362
a7eff1e0	363	test_expect_success 'follow advice and skip nil patch' '
093a3091 JN	364	pristine_detach conflicting &&
	365	test_must_fail git cherry-pick initial..picked &&
	366
	367	git checkout HEAD -- unrelated &&
	368	test_must_fail git cherry-pick --continue &&
	369	git reset &&
	370	git cherry-pick --continue &&
	371
	372	git rev-list initial..HEAD >commits &&
	373	test_line_count = 3 commits
	374	'
	375
5a5d80f4 RR	376	test_expect_success '--continue respects opts' '
5a5d80f4 RR	377	pristine_detach initial &&
c6b7c7f3	378	test_expect_code 1 git cherry-pick -x base..anotherpick &&
5a5d80f4 RR	379	echo "c" >foo &&
	380	git add foo &&
	381	git commit &&
	382	git cherry-pick --continue &&
	383	test_path_is_missing .git/sequencer &&
	384	git cat-file commit HEAD >anotherpick_msg &&
	385	git cat-file commit HEAD~1 >picked_msg &&
	386	git cat-file commit HEAD~2 >unrelatedpick_msg &&
	387	git cat-file commit HEAD~3 >initial_msg &&
c7cf9566	388	! grep "cherry picked from" initial_msg &&
5a5d80f4 RR	389	grep "cherry picked from" unrelatedpick_msg &&
	390	grep "cherry picked from" picked_msg &&
	391	grep "cherry picked from" anotherpick_msg
	392	'
	393
093a3091 JN	394	test_expect_success '--continue of single-pick respects -x' '
	395	pristine_detach initial &&
	396	test_must_fail git cherry-pick -x picked &&
	397	echo c >foo &&
	398	git add foo &&
	399	git cherry-pick --continue &&
	400	test_path_is_missing .git/sequencer &&
	401	git cat-file commit HEAD >msg &&
	402	grep "cherry picked from" msg
	403	'
	404
	405	test_expect_success '--continue respects -x in first commit in multi-pick' '
	406	pristine_detach initial &&
	407	test_must_fail git cherry-pick -x picked anotherpick &&
	408	echo c >foo &&
	409	git add foo &&
	410	git cherry-pick --continue &&
	411	test_path_is_missing .git/sequencer &&
	412	git cat-file commit HEAD^ >msg &&
	413	picked=$(git rev-parse --verify picked) &&
	414	grep "cherry picked from.*$picked" msg
	415	'
	416
5ed75e2a	417	test_expect_failure '--signoff is automatically propagated to resolved conflict' '
5a5d80f4	418	pristine_detach initial &&
c6b7c7f3	419	test_expect_code 1 git cherry-pick --signoff base..anotherpick &&
5a5d80f4 RR	420	echo "c" >foo &&
	421	git add foo &&
	422	git commit &&
	423	git cherry-pick --continue &&
	424	test_path_is_missing .git/sequencer &&
	425	git cat-file commit HEAD >anotherpick_msg &&
	426	git cat-file commit HEAD~1 >picked_msg &&
	427	git cat-file commit HEAD~2 >unrelatedpick_msg &&
	428	git cat-file commit HEAD~3 >initial_msg &&
c7cf9566	429	! grep "Signed-off-by:" initial_msg &&
5a5d80f4	430	grep "Signed-off-by:" unrelatedpick_msg &&
c7cf9566	431	! grep "Signed-off-by:" picked_msg &&
5a5d80f4 RR	432	grep "Signed-off-by:" anotherpick_msg
	433	'
	434
5ed75e2a	435	test_expect_failure '--signoff dropped for implicit commit of resolution, multi-pick case' '
093a3091 JN	436	pristine_detach initial &&
	437	test_must_fail git cherry-pick -s picked anotherpick &&
	438	echo c >foo &&
	439	git add foo &&
	440	git cherry-pick --continue &&
	441
	442	git diff --exit-code HEAD &&
	443	test_cmp_rev initial HEAD^^ &&
	444	git cat-file commit HEAD^ >msg &&
	445	! grep Signed-off-by: msg
	446	'
	447
5ed75e2a	448	test_expect_failure 'sign-off needs to be reaffirmed after conflict resolution, single-pick case' '
093a3091 JN	449	pristine_detach initial &&
	450	test_must_fail git cherry-pick -s picked &&
	451	echo c >foo &&
	452	git add foo &&
	453	git cherry-pick --continue &&
	454
	455	git diff --exit-code HEAD &&
	456	test_cmp_rev initial HEAD^ &&
	457	git cat-file commit HEAD >msg &&
	458	! grep Signed-off-by: msg
	459	'
	460
5a5d80f4 RR	461	test_expect_success 'malformed instruction sheet 1' '
5a5d80f4 RR	462	pristine_detach initial &&
c6b7c7f3	463	test_expect_code 1 git cherry-pick base..anotherpick &&
5a5d80f4 RR	464	echo "resolved" >foo &&
	465	git add foo &&
	466	git commit &&
	467	sed "s/pick /pick/" .git/sequencer/todo >new_sheet &&
	468	cp new_sheet .git/sequencer/todo &&
c6b7c7f3	469	test_expect_code 128 git cherry-pick --continue
5a5d80f4 RR	470	'
	471
	472	test_expect_success 'malformed instruction sheet 2' '
	473	pristine_detach initial &&
c6b7c7f3	474	test_expect_code 1 git cherry-pick base..anotherpick &&
5a5d80f4 RR	475	echo "resolved" >foo &&
	476	git add foo &&
	477	git commit &&
	478	sed "s/pick/revert/" .git/sequencer/todo >new_sheet &&
	479	cp new_sheet .git/sequencer/todo &&
c6b7c7f3	480	test_expect_code 128 git cherry-pick --continue
5a5d80f4 RR	481	'
5a5d80f4 RR	482
7f13334e JN	483	test_expect_success 'empty commit set' '
	484	pristine_detach initial &&
	485	test_expect_code 128 git cherry-pick base..base
	486	'
	487
6bc1a235 RR	488	test_expect_success 'malformed instruction sheet 3' '
6bc1a235 RR	489	pristine_detach initial &&
c6b7c7f3	490	test_expect_code 1 git cherry-pick base..anotherpick &&
6bc1a235 RR	491	echo "resolved" >foo &&
	492	git add foo &&
	493	git commit &&
	494	sed "s/pick \([0-9a-f]*\)/pick $_r10/" .git/sequencer/todo >new_sheet &&
	495	cp new_sheet .git/sequencer/todo &&
c6b7c7f3	496	test_expect_code 128 git cherry-pick --continue
6bc1a235 RR	497	'
6bc1a235 RR	498
0db76962 RR	499	test_expect_success 'instruction sheet, fat-fingers version' '
0db76962 RR	500	pristine_detach initial &&
c6b7c7f3	501	test_expect_code 1 git cherry-pick base..anotherpick &&
0db76962 RR	502	echo "c" >foo &&
	503	git add foo &&
	504	git commit &&
	505	sed "s/pick \([0-9a-f]*\)/pick \1 /" .git/sequencer/todo >new_sheet &&
	506	cp new_sheet .git/sequencer/todo &&
	507	git cherry-pick --continue
	508	'
	509
6bc1a235 RR	510	test_expect_success 'commit descriptions in insn sheet are optional' '
6bc1a235 RR	511	pristine_detach initial &&
c6b7c7f3	512	test_expect_code 1 git cherry-pick base..anotherpick &&
6bc1a235 RR	513	echo "c" >foo &&
	514	git add foo &&
	515	git commit &&
	516	cut -d" " -f1,2 .git/sequencer/todo >new_sheet &&
	517	cp new_sheet .git/sequencer/todo &&
	518	git cherry-pick --continue &&
	519	test_path_is_missing .git/sequencer &&
	520	git rev-list HEAD >commits &&
	521	test_line_count = 4 commits
	522	'
	523
04d3d3cf	524	test_done