[thirdparty/git.git] / t / t3432-rebase-fast-forward.sh

#!/bin/sh
#
# Copyright (c) 2019 Denton Liu
#

test_description='ensure rebase fast-forwards commits when possible'

GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME

. ./test-lib.sh

test_expect_success setup '
	test_commit A &&
	test_commit B &&
	test_commit C &&
	test_commit D &&
	git checkout -t -b side
'

test_rebase_same_head () {
	status_n="$1" &&
	shift &&
	what_n="$1" &&
	shift &&
	cmp_n="$1" &&
	shift &&
	status_f="$1" &&
	shift &&
	what_f="$1" &&
	shift &&
	cmp_f="$1" &&
	shift &&
	test_rebase_same_head_ $status_n $what_n $cmp_n 0 " --apply" "$*" &&
	test_rebase_same_head_ $status_f $what_f $cmp_f 0 " --apply --no-ff" "$*"
	test_rebase_same_head_ $status_n $what_n $cmp_n 0 " --merge" "$*" &&
	test_rebase_same_head_ $status_f $what_f $cmp_f 0 " --merge --no-ff" "$*"
	test_rebase_same_head_ $status_n $what_n $cmp_n 1 " --merge" "$*" &&
	test_rebase_same_head_ $status_f $what_f $cmp_f 1 " --merge --no-ff" "$*"
}

test_rebase_same_head_ () {
	status="$1" &&
	shift &&
	what="$1" &&
	shift &&
	cmp="$1" &&
	shift &&
	abbreviate="$1" &&
	shift &&
	flag="$1"
	shift &&
	if test $abbreviate -eq 1
	then
		msg="git rebase$flag $* (rebase.abbreviateCommands = true) with $changes is $what with $cmp HEAD"
	else
		msg="git rebase$flag $* with $changes is $what with $cmp HEAD"
	fi &&
	test_expect_$status "$msg" "
		if test $abbreviate -eq 1
		then
			test_config rebase.abbreviateCommands true
		fi &&
		oldhead=\$(git rev-parse HEAD) &&
		test_when_finished 'git reset --hard \$oldhead' &&
		git reflog HEAD >expect &&
		git rebase$flag $* >stdout &&
		git reflog HEAD >actual &&
		if test $what = work
		then
			old=\$(wc -l <expect) &&
			test_line_count '-gt' \$old actual
		elif test $what = noop
		then
			test_cmp expect actual
		fi &&
		newhead=\$(git rev-parse HEAD) &&
		if test $cmp = same
		then
			test_cmp_rev \$oldhead \$newhead
		elif test $cmp = diff
		then
			test_cmp_rev ! \$oldhead \$newhead
		fi
	"
}

changes='no changes'
test_rebase_same_head success noop same success work same
test_rebase_same_head success noop same success work same master
test_rebase_same_head success noop same success work diff --onto B B
test_rebase_same_head success noop same success work diff --onto B... B
test_rebase_same_head success noop same success work same --onto master... master
test_rebase_same_head success noop same success work same --keep-base master
test_rebase_same_head success noop same success work same --keep-base
test_rebase_same_head success noop same success work same --no-fork-point
test_rebase_same_head success noop same success work same --keep-base --no-fork-point
test_rebase_same_head success noop same success work same --fork-point master
test_rebase_same_head success noop same success work diff --fork-point --onto B B
test_rebase_same_head success noop same success work diff --fork-point --onto B... B
test_rebase_same_head success noop same success work same --fork-point --onto master... master
test_rebase_same_head success noop same success work same --keep-base --keep-base master

test_expect_success 'add work same to side' '
	test_commit E
'

changes='our changes'
test_rebase_same_head success noop same success work same
test_rebase_same_head success noop same success work same master
test_rebase_same_head success noop same success work diff --onto B B
test_rebase_same_head success noop same success work diff --onto B... B
test_rebase_same_head success noop same success work same --onto master... master
test_rebase_same_head success noop same success work same --keep-base master
test_rebase_same_head success noop same success work same --keep-base
test_rebase_same_head success noop same success work same --no-fork-point
test_rebase_same_head success noop same success work same --keep-base --no-fork-point
test_rebase_same_head success noop same success work same --fork-point master
test_rebase_same_head success noop same success work diff --fork-point --onto B B
test_rebase_same_head success noop same success work diff --fork-point --onto B... B
test_rebase_same_head success noop same success work same --fork-point --onto master... master
test_rebase_same_head success noop same success work same --fork-point --keep-base master

test_expect_success 'add work same to upstream' '
	git checkout master &&
	test_commit F &&
	git checkout side
'

changes='our and their changes'
test_rebase_same_head success noop same success work diff --onto B B
test_rebase_same_head success noop same success work diff --onto B... B
test_rebase_same_head success noop same success work diff --onto master... master
test_rebase_same_head success noop same success work diff --keep-base master
test_rebase_same_head success noop same success work diff --keep-base
test_rebase_same_head failure work same success work diff --fork-point --onto B B
test_rebase_same_head failure work same success work diff --fork-point --onto B... B
test_rebase_same_head success noop same success work diff --fork-point --onto master... master
test_rebase_same_head success noop same success work diff --fork-point --keep-base master

test_done
Commit	Line	Data
793ac7e3 DL	1	#!/bin/sh
	2	#
	3	# Copyright (c) 2019 Denton Liu
	4	#
	5
	6	test_description='ensure rebase fast-forwards commits when possible'
	7
334afbc7 JS	8	GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
	9	export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
	10
793ac7e3 DL	11	. ./test-lib.sh
	12
	13	test_expect_success setup '
	14	test_commit A &&
	15	test_commit B &&
	16	test_commit C &&
	17	test_commit D &&
	18	git checkout -t -b side
	19	'
	20
	21	test_rebase_same_head () {
c9efc216 ÆAB	22	status_n="$1" &&
	23	shift &&
	24	what_n="$1" &&
	25	shift &&
	26	cmp_n="$1" &&
	27	shift &&
	28	status_f="$1" &&
	29	shift &&
	30	what_f="$1" &&
	31	shift &&
	32	cmp_f="$1" &&
	33	shift &&
de9f1d3e AG	34	test_rebase_same_head_ $status_n $what_n $cmp_n 0 " --apply" "$*" &&
	35	test_rebase_same_head_ $status_f $what_f $cmp_f 0 " --apply --no-ff" "$*"
	36	test_rebase_same_head_ $status_n $what_n $cmp_n 0 " --merge" "$*" &&
	37	test_rebase_same_head_ $status_f $what_f $cmp_f 0 " --merge --no-ff" "$*"
	38	test_rebase_same_head_ $status_n $what_n $cmp_n 1 " --merge" "$*" &&
	39	test_rebase_same_head_ $status_f $what_f $cmp_f 1 " --merge --no-ff" "$*"
c9efc216 ÆAB	40	}
	41
	42	test_rebase_same_head_ () {
793ac7e3 DL	43	status="$1" &&
793ac7e3 DL	44	shift &&
4336d365 ÆAB	45	what="$1" &&
	46	shift &&
	47	cmp="$1" &&
	48	shift &&
de9f1d3e AG	49	abbreviate="$1" &&
de9f1d3e AG	50	shift &&
c9efc216 ÆAB	51	flag="$1"
c9efc216 ÆAB	52	shift &&
de9f1d3e AG	53	if test $abbreviate -eq 1
	54	then
	55	msg="git rebase$flag $* (rebase.abbreviateCommands = true) with $changes is $what with $cmp HEAD"
	56	else
	57	msg="git rebase$flag $* with $changes is $what with $cmp HEAD"
	58	fi &&
	59	test_expect_$status "$msg" "
	60	if test $abbreviate -eq 1
	61	then
	62	test_config rebase.abbreviateCommands true
	63	fi &&
793ac7e3 DL	64	oldhead=\$(git rev-parse HEAD) &&
793ac7e3 DL	65	test_when_finished 'git reset --hard \$oldhead' &&
ce57d856	66	git reflog HEAD >expect &&
c9efc216	67	git rebase$flag $* >stdout &&
ce57d856	68	git reflog HEAD >actual &&
4336d365 ÆAB	69	if test $what = work
4336d365 ÆAB	70	then
9a70f3d4	71	old=\$(wc -l <expect) &&
ce57d856	72	test_line_count '-gt' \$old actual
4336d365 ÆAB	73	elif test $what = noop
4336d365 ÆAB	74	then
ce57d856	75	test_cmp expect actual
4336d365	76	fi &&
793ac7e3	77	newhead=\$(git rev-parse HEAD) &&
4336d365 ÆAB	78	if test $cmp = same
	79	then
	80	test_cmp_rev \$oldhead \$newhead
	81	elif test $cmp = diff
	82	then
2c9e125b	83	test_cmp_rev ! \$oldhead \$newhead
4336d365	84	fi
793ac7e3 DL	85	"
	86	}
	87
	88	changes='no changes'
4effc5bc	89	test_rebase_same_head success noop same success work same
9a70f3d4 EN	90	test_rebase_same_head success noop same success work same master
	91	test_rebase_same_head success noop same success work diff --onto B B
	92	test_rebase_same_head success noop same success work diff --onto B... B
	93	test_rebase_same_head success noop same success work same --onto master... master
	94	test_rebase_same_head success noop same success work same --keep-base master
	95	test_rebase_same_head success noop same success work same --keep-base
	96	test_rebase_same_head success noop same success work same --no-fork-point
	97	test_rebase_same_head success noop same success work same --keep-base --no-fork-point
4effc5bc DL	98	test_rebase_same_head success noop same success work same --fork-point master
	99	test_rebase_same_head success noop same success work diff --fork-point --onto B B
	100	test_rebase_same_head success noop same success work diff --fork-point --onto B... B
	101	test_rebase_same_head success noop same success work same --fork-point --onto master... master
414d924b	102	test_rebase_same_head success noop same success work same --keep-base --keep-base master
793ac7e3	103
4336d365	104	test_expect_success 'add work same to side' '
793ac7e3 DL	105	test_commit E
	106	'
	107
	108	changes='our changes'
4effc5bc	109	test_rebase_same_head success noop same success work same
9a70f3d4 EN	110	test_rebase_same_head success noop same success work same master
	111	test_rebase_same_head success noop same success work diff --onto B B
	112	test_rebase_same_head success noop same success work diff --onto B... B
	113	test_rebase_same_head success noop same success work same --onto master... master
	114	test_rebase_same_head success noop same success work same --keep-base master
	115	test_rebase_same_head success noop same success work same --keep-base
	116	test_rebase_same_head success noop same success work same --no-fork-point
	117	test_rebase_same_head success noop same success work same --keep-base --no-fork-point
4effc5bc DL	118	test_rebase_same_head success noop same success work same --fork-point master
	119	test_rebase_same_head success noop same success work diff --fork-point --onto B B
	120	test_rebase_same_head success noop same success work diff --fork-point --onto B... B
	121	test_rebase_same_head success noop same success work same --fork-point --onto master... master
414d924b	122	test_rebase_same_head success noop same success work same --fork-point --keep-base master
793ac7e3	123
4336d365	124	test_expect_success 'add work same to upstream' '
793ac7e3 DL	125	git checkout master &&
	126	test_commit F &&
	127	git checkout side
	128	'
	129
	130	changes='our and their changes'
9a70f3d4 EN	131	test_rebase_same_head success noop same success work diff --onto B B
9a70f3d4 EN	132	test_rebase_same_head success noop same success work diff --onto B... B
c0efb4c1	133	test_rebase_same_head success noop same success work diff --onto master... master
414d924b DL	134	test_rebase_same_head success noop same success work diff --keep-base master
414d924b DL	135	test_rebase_same_head success noop same success work diff --keep-base
c9efc216 ÆAB	136	test_rebase_same_head failure work same success work diff --fork-point --onto B B
c9efc216 ÆAB	137	test_rebase_same_head failure work same success work diff --fork-point --onto B... B
c0efb4c1	138	test_rebase_same_head success noop same success work diff --fork-point --onto master... master
414d924b	139	test_rebase_same_head success noop same success work diff --fork-point --keep-base master
793ac7e3 DL	140
793ac7e3 DL	141	test_done