[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 '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 &&
	test_must_fail 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 &&
	test_must_fail grep "Signed-off-by:" initial_msg &&
	grep "Signed-off-by:" unrelatedpick_msg &&
	test_must_fail 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
	150	test_expect_success 'cherry-pick --abort to cancel multiple revert' '
	151	pristine_detach anotherpick &&
c6b7c7f3	152	test_expect_code 1 git revert base..picked &&
539047c1 JN	153	git cherry-pick --abort &&
	154	test_path_is_missing .git/sequencer &&
	155	test_cmp_rev anotherpick HEAD &&
	156	git update-index --refresh &&
	157	git diff-index --exit-code HEAD
	158	'
	159
	160	test_expect_success 'revert --abort works, too' '
	161	pristine_detach anotherpick &&
c6b7c7f3	162	test_expect_code 1 git revert base..picked &&
539047c1 JN	163	git revert --abort &&
	164	test_path_is_missing .git/sequencer &&
	165	test_cmp_rev anotherpick HEAD
	166	'
	167
	168	test_expect_success '--abort to cancel single revert' '
	169	pristine_detach anotherpick &&
c6b7c7f3	170	test_expect_code 1 git revert picked &&
539047c1 JN	171	git revert --abort &&
	172	test_path_is_missing .git/sequencer &&
	173	test_cmp_rev anotherpick HEAD &&
	174	git update-index --refresh &&
	175	git diff-index --exit-code HEAD
	176	'
	177
	178	test_expect_success '--abort keeps unrelated change, easy case' '
	179	pristine_detach unrelatedpick &&
	180	echo changed >expect &&
c6b7c7f3	181	test_expect_code 1 git cherry-pick picked..yetanotherpick &&
539047c1 JN	182	echo changed >unrelated &&
	183	git cherry-pick --abort &&
	184	test_cmp expect unrelated
	185	'
	186
	187	test_expect_success '--abort refuses to clobber unrelated change, harder case' '
	188	pristine_detach initial &&
	189	echo changed >expect &&
c6b7c7f3	190	test_expect_code 1 git cherry-pick base..anotherpick &&
539047c1 JN	191	echo changed >unrelated &&
	192	test_must_fail git cherry-pick --abort &&
	193	test_cmp expect unrelated &&
	194	git rev-list HEAD >log &&
	195	test_line_count = 2 log &&
	196	test_must_fail git update-index --refresh &&
	197
	198	git checkout unrelated &&
	199	git cherry-pick --abort &&
	200	test_cmp_rev initial HEAD
	201	'
	202
218b65fb	203	test_expect_success 'cherry-pick still writes sequencer state when one commit is left' '
2d27daa9	204	pristine_detach initial &&
c6b7c7f3	205	test_expect_code 1 git cherry-pick base..picked &&
218b65fb	206	test_path_is_dir .git/sequencer &&
2d27daa9 RR	207	echo "resolved" >foo &&
	208	git add foo &&
	209	git commit &&
	210	{
	211	git rev-list HEAD \|
	212	git diff-tree --root --stdin \|
	213	sed "s/$_x40/OBJID/g"
	214	} >actual &&
	215	cat >expect <<-\EOF &&
	216	OBJID
	217	:100644 100644 OBJID OBJID M foo
	218	OBJID
	219	:100644 100644 OBJID OBJID M unrelated
	220	OBJID
	221	:000000 100644 OBJID OBJID A foo
	222	:000000 100644 OBJID OBJID A unrelated
	223	EOF
	224	test_cmp expect actual
	225	'
	226
218b65fb	227	test_expect_success '--abort after last commit in sequence' '
539047c1	228	pristine_detach initial &&
c6b7c7f3	229	test_expect_code 1 git cherry-pick base..picked &&
539047c1 JN	230	git cherry-pick --abort &&
	231	test_path_is_missing .git/sequencer &&
	232	test_cmp_rev initial HEAD &&
	233	git update-index --refresh &&
	234	git diff-index --exit-code HEAD
	235	'
	236
21afd080 RR	237	test_expect_success 'cherry-pick does not implicitly stomp an existing operation' '
21afd080 RR	238	pristine_detach initial &&
c6b7c7f3	239	test_expect_code 1 git cherry-pick base..anotherpick &&
21afd080	240	test-chmtime -v +0 .git/sequencer >expect &&
c6b7c7f3	241	test_expect_code 128 git cherry-pick unrelatedpick &&
21afd080 RR	242	test-chmtime -v +0 .git/sequencer >actual &&
	243	test_cmp expect actual
	244	'
	245
5a5d80f4 RR	246	test_expect_success '--continue complains when no cherry-pick is in progress' '
5a5d80f4 RR	247	pristine_detach initial &&
c6b7c7f3	248	test_expect_code 128 git cherry-pick --continue
5a5d80f4 RR	249	'
	250
	251	test_expect_success '--continue complains when there are unresolved conflicts' '
	252	pristine_detach initial &&
c6b7c7f3 RR	253	test_expect_code 1 git cherry-pick base..anotherpick &&
c6b7c7f3 RR	254	test_expect_code 128 git cherry-pick --continue
5a5d80f4 RR	255	'
5a5d80f4 RR	256
093a3091 JN	257	test_expect_success '--continue of single cherry-pick' '
	258	pristine_detach initial &&
	259	echo c >expect &&
	260	test_must_fail git cherry-pick picked &&
	261	echo c >foo &&
	262	git add foo &&
	263	git cherry-pick --continue &&
	264
	265	test_cmp expect foo &&
	266	test_cmp_rev initial HEAD^ &&
	267	git diff --exit-code HEAD &&
	268	test_must_fail git rev-parse --verify CHERRY_PICK_HEAD
	269	'
	270
	271	test_expect_success '--continue of single revert' '
	272	pristine_detach initial &&
	273	echo resolved >expect &&
	274	echo "Revert \"picked\"" >expect.msg &&
	275	test_must_fail git revert picked &&
	276	echo resolved >foo &&
	277	git add foo &&
	278	git cherry-pick --continue &&
	279
	280	git diff --exit-code HEAD &&
	281	test_cmp expect foo &&
	282	test_cmp_rev initial HEAD^ &&
	283	git diff-tree -s --pretty=tformat:%s HEAD >msg &&
	284	test_cmp expect.msg msg &&
	285	test_must_fail git rev-parse --verify CHERRY_PICK_HEAD &&
	286	test_must_fail git rev-parse --verify REVERT_HEAD
	287	'
	288
	289	test_expect_success '--continue after resolving conflicts' '
	290	pristine_detach initial &&
	291	echo d >expect &&
	292	cat >expect.log <<-\EOF &&
	293	OBJID
	294	:100644 100644 OBJID OBJID M foo
	295	OBJID
	296	:100644 100644 OBJID OBJID M foo
	297	OBJID
	298	:100644 100644 OBJID OBJID M unrelated
	299	OBJID
	300	:000000 100644 OBJID OBJID A foo
	301	:000000 100644 OBJID OBJID A unrelated
	302	EOF
	303	test_must_fail git cherry-pick base..anotherpick &&
	304	echo c >foo &&
	305	git add foo &&
	306	git cherry-pick --continue &&
	307	{
	308	git rev-list HEAD \|
	309	git diff-tree --root --stdin \|
	310	sed "s/$_x40/OBJID/g"
	311	} >actual.log &&
	312	test_cmp expect foo &&
	313	test_cmp expect.log actual.log
	314	'
	315
	316	test_expect_success '--continue after resolving conflicts and committing' '
5a5d80f4	317	pristine_detach initial &&
c6b7c7f3	318	test_expect_code 1 git cherry-pick base..anotherpick &&
5a5d80f4 RR	319	echo "c" >foo &&
	320	git add foo &&
	321	git commit &&
	322	git cherry-pick --continue &&
	323	test_path_is_missing .git/sequencer &&
	324	{
	325	git rev-list HEAD \|
	326	git diff-tree --root --stdin \|
	327	sed "s/$_x40/OBJID/g"
	328	} >actual &&
	329	cat >expect <<-\EOF &&
	330	OBJID
	331	:100644 100644 OBJID OBJID M foo
	332	OBJID
	333	:100644 100644 OBJID OBJID M foo
	334	OBJID
	335	:100644 100644 OBJID OBJID M unrelated
	336	OBJID
	337	:000000 100644 OBJID OBJID A foo
	338	:000000 100644 OBJID OBJID A unrelated
	339	EOF
	340	test_cmp expect actual
	341	'
	342
093a3091 JN	343	test_expect_success '--continue asks for help after resolving patch to nil' '
	344	pristine_detach conflicting &&
	345	test_must_fail git cherry-pick initial..picked &&
	346
	347	test_cmp_rev unrelatedpick CHERRY_PICK_HEAD &&
	348	git checkout HEAD -- unrelated &&
	349	test_must_fail git cherry-pick --continue 2>msg &&
	350	test_i18ngrep "The previous cherry-pick is now empty" msg
	351	'
	352
a7eff1e0	353	test_expect_success 'follow advice and skip nil patch' '
093a3091 JN	354	pristine_detach conflicting &&
	355	test_must_fail git cherry-pick initial..picked &&
	356
	357	git checkout HEAD -- unrelated &&
	358	test_must_fail git cherry-pick --continue &&
	359	git reset &&
	360	git cherry-pick --continue &&
	361
	362	git rev-list initial..HEAD >commits &&
	363	test_line_count = 3 commits
	364	'
	365
5a5d80f4 RR	366	test_expect_success '--continue respects opts' '
5a5d80f4 RR	367	pristine_detach initial &&
c6b7c7f3	368	test_expect_code 1 git cherry-pick -x base..anotherpick &&
5a5d80f4 RR	369	echo "c" >foo &&
	370	git add foo &&
	371	git commit &&
	372	git cherry-pick --continue &&
	373	test_path_is_missing .git/sequencer &&
	374	git cat-file commit HEAD >anotherpick_msg &&
	375	git cat-file commit HEAD~1 >picked_msg &&
	376	git cat-file commit HEAD~2 >unrelatedpick_msg &&
	377	git cat-file commit HEAD~3 >initial_msg &&
	378	test_must_fail grep "cherry picked from" initial_msg &&
	379	grep "cherry picked from" unrelatedpick_msg &&
	380	grep "cherry picked from" picked_msg &&
	381	grep "cherry picked from" anotherpick_msg
	382	'
	383
093a3091 JN	384	test_expect_success '--continue of single-pick respects -x' '
	385	pristine_detach initial &&
	386	test_must_fail git cherry-pick -x picked &&
	387	echo c >foo &&
	388	git add foo &&
	389	git cherry-pick --continue &&
	390	test_path_is_missing .git/sequencer &&
	391	git cat-file commit HEAD >msg &&
	392	grep "cherry picked from" msg
	393	'
	394
	395	test_expect_success '--continue respects -x in first commit in multi-pick' '
	396	pristine_detach initial &&
	397	test_must_fail git cherry-pick -x picked anotherpick &&
	398	echo c >foo &&
	399	git add foo &&
	400	git cherry-pick --continue &&
	401	test_path_is_missing .git/sequencer &&
	402	git cat-file commit HEAD^ >msg &&
	403	picked=$(git rev-parse --verify picked) &&
	404	grep "cherry picked from.*$picked" msg
	405	'
	406
5ed75e2a	407	test_expect_failure '--signoff is automatically propagated to resolved conflict' '
5a5d80f4	408	pristine_detach initial &&
c6b7c7f3	409	test_expect_code 1 git cherry-pick --signoff base..anotherpick &&
5a5d80f4 RR	410	echo "c" >foo &&
	411	git add foo &&
	412	git commit &&
	413	git cherry-pick --continue &&
	414	test_path_is_missing .git/sequencer &&
	415	git cat-file commit HEAD >anotherpick_msg &&
	416	git cat-file commit HEAD~1 >picked_msg &&
	417	git cat-file commit HEAD~2 >unrelatedpick_msg &&
	418	git cat-file commit HEAD~3 >initial_msg &&
	419	test_must_fail grep "Signed-off-by:" initial_msg &&
	420	grep "Signed-off-by:" unrelatedpick_msg &&
	421	test_must_fail grep "Signed-off-by:" picked_msg &&
	422	grep "Signed-off-by:" anotherpick_msg
	423	'
	424
5ed75e2a	425	test_expect_failure '--signoff dropped for implicit commit of resolution, multi-pick case' '
093a3091 JN	426	pristine_detach initial &&
	427	test_must_fail git cherry-pick -s picked anotherpick &&
	428	echo c >foo &&
	429	git add foo &&
	430	git cherry-pick --continue &&
	431
	432	git diff --exit-code HEAD &&
	433	test_cmp_rev initial HEAD^^ &&
	434	git cat-file commit HEAD^ >msg &&
	435	! grep Signed-off-by: msg
	436	'
	437
5ed75e2a	438	test_expect_failure 'sign-off needs to be reaffirmed after conflict resolution, single-pick case' '
093a3091 JN	439	pristine_detach initial &&
	440	test_must_fail git cherry-pick -s picked &&
	441	echo c >foo &&
	442	git add foo &&
	443	git cherry-pick --continue &&
	444
	445	git diff --exit-code HEAD &&
	446	test_cmp_rev initial HEAD^ &&
	447	git cat-file commit HEAD >msg &&
	448	! grep Signed-off-by: msg
	449	'
	450
5a5d80f4 RR	451	test_expect_success 'malformed instruction sheet 1' '
5a5d80f4 RR	452	pristine_detach initial &&
c6b7c7f3	453	test_expect_code 1 git cherry-pick base..anotherpick &&
5a5d80f4 RR	454	echo "resolved" >foo &&
	455	git add foo &&
	456	git commit &&
	457	sed "s/pick /pick/" .git/sequencer/todo >new_sheet &&
	458	cp new_sheet .git/sequencer/todo &&
c6b7c7f3	459	test_expect_code 128 git cherry-pick --continue
5a5d80f4 RR	460	'
	461
	462	test_expect_success 'malformed instruction sheet 2' '
	463	pristine_detach initial &&
c6b7c7f3	464	test_expect_code 1 git cherry-pick base..anotherpick &&
5a5d80f4 RR	465	echo "resolved" >foo &&
	466	git add foo &&
	467	git commit &&
	468	sed "s/pick/revert/" .git/sequencer/todo >new_sheet &&
	469	cp new_sheet .git/sequencer/todo &&
c6b7c7f3	470	test_expect_code 128 git cherry-pick --continue
5a5d80f4 RR	471	'
5a5d80f4 RR	472
7f13334e JN	473	test_expect_success 'empty commit set' '
	474	pristine_detach initial &&
	475	test_expect_code 128 git cherry-pick base..base
	476	'
	477
6bc1a235 RR	478	test_expect_success 'malformed instruction sheet 3' '
6bc1a235 RR	479	pristine_detach initial &&
c6b7c7f3	480	test_expect_code 1 git cherry-pick base..anotherpick &&
6bc1a235 RR	481	echo "resolved" >foo &&
	482	git add foo &&
	483	git commit &&
	484	sed "s/pick \([0-9a-f]*\)/pick $_r10/" .git/sequencer/todo >new_sheet &&
	485	cp new_sheet .git/sequencer/todo &&
c6b7c7f3	486	test_expect_code 128 git cherry-pick --continue
6bc1a235 RR	487	'
6bc1a235 RR	488
0db76962 RR	489	test_expect_success 'instruction sheet, fat-fingers version' '
0db76962 RR	490	pristine_detach initial &&
c6b7c7f3	491	test_expect_code 1 git cherry-pick base..anotherpick &&
0db76962 RR	492	echo "c" >foo &&
	493	git add foo &&
	494	git commit &&
	495	sed "s/pick \([0-9a-f]*\)/pick \1 /" .git/sequencer/todo >new_sheet &&
	496	cp new_sheet .git/sequencer/todo &&
	497	git cherry-pick --continue
	498	'
	499
6bc1a235 RR	500	test_expect_success 'commit descriptions in insn sheet are optional' '
6bc1a235 RR	501	pristine_detach initial &&
c6b7c7f3	502	test_expect_code 1 git cherry-pick base..anotherpick &&
6bc1a235 RR	503	echo "c" >foo &&
	504	git add foo &&
	505	git commit &&
	506	cut -d" " -f1,2 .git/sequencer/todo >new_sheet &&
	507	cp new_sheet .git/sequencer/todo &&
	508	git cherry-pick --continue &&
	509	test_path_is_missing .git/sequencer &&
	510	git rev-list HEAD >commits &&
	511	test_line_count = 4 commits
	512	'
	513
04d3d3cf	514	test_done