[thirdparty/git.git] / t / t3400-rebase.sh

#!/bin/sh
#
# Copyright (c) 2005 Amos Waterland
#

test_description='git rebase assorted tests

This test runs git rebase and checks that the author information is not lost
among other things.
'
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME

. ./test-lib.sh

GIT_AUTHOR_NAME=author@name
GIT_AUTHOR_EMAIL=bogus@email@address
export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL

test_expect_success 'prepare repository with topic branches' '
	git config core.logAllRefUpdates true &&
	echo First >A &&
	git update-index --add A &&
	git commit -m "Add A." &&
	git checkout -b force-3way &&
	echo Dummy >Y &&
	git update-index --add Y &&
	git commit -m "Add Y." &&
	git checkout -b filemove &&
	git reset --soft main &&
	mkdir D &&
	git mv A D/A &&
	git commit -m "Move A." &&
	git checkout -b my-topic-branch main &&
	echo Second >B &&
	git update-index --add B &&
	git commit -m "Add B." &&
	git checkout -f main &&
	echo Third >>A &&
	git update-index A &&
	git commit -m "Modify A." &&
	git checkout -b side my-topic-branch &&
	echo Side >>C &&
	git add C &&
	git commit -m "Add C" &&
	git checkout -f my-topic-branch &&
	git tag topic
'

test_expect_success 'rebase on dirty worktree' '
	echo dirty >>A &&
	test_must_fail git rebase main
'

test_expect_success 'rebase on dirty cache' '
	git add A &&
	test_must_fail git rebase main
'

test_expect_success 'rebase against main' '
	git reset --hard HEAD &&
	git rebase main
'

test_expect_success 'rebase sets ORIG_HEAD to pre-rebase state' '
	git checkout -b orig-head topic &&
	pre="$(git rev-parse --verify HEAD)" &&
	git rebase main &&
	test_cmp_rev "$pre" ORIG_HEAD &&
	test_cmp_rev ! "$pre" HEAD
'

test_expect_success 'rebase, with <onto> and <upstream> specified as :/quuxery' '
	test_when_finished "git branch -D torebase" &&
	git checkout -b torebase my-topic-branch^ &&
	upstream=$(git rev-parse ":/Add B") &&
	onto=$(git rev-parse ":/Add A") &&
	git rebase --onto $onto $upstream &&
	git reset --hard my-topic-branch^ &&
	git rebase --onto ":/Add A" ":/Add B" &&
	git checkout my-topic-branch
'

test_expect_success 'the rebase operation should not have destroyed author information' '
	! (git log | grep "Author:" | grep "<>")
'

test_expect_success 'the rebase operation should not have destroyed author information (2)' "
	git log -1 |
	grep 'Author: $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>'
"

test_expect_success 'HEAD was detached during rebase' '
	test $(git rev-parse HEAD@{1}) != $(git rev-parse my-topic-branch@{1})
'

test_expect_success 'rebase from ambiguous branch name' '
	git checkout -b topic side &&
	git rebase main
'

test_expect_success 'rebase off of the previous branch using "-"' '
	git checkout main &&
	git checkout HEAD^ &&
	git rebase @{-1} >expect.messages &&
	git merge-base main HEAD >expect.forkpoint &&

	git checkout main &&
	git checkout HEAD^ &&
	git rebase - >actual.messages &&
	git merge-base main HEAD >actual.forkpoint &&

	test_cmp expect.forkpoint actual.forkpoint &&
	# the next one is dubious---we may want to say "-",
	# instead of @{-1}, in the message
	test_cmp expect.messages actual.messages
'

test_expect_success 'rebase a single mode change' '
	git checkout main &&
	git branch -D topic &&
	echo 1 >X &&
	git add X &&
	test_tick &&
	git commit -m prepare &&
	git checkout -b modechange HEAD^ &&
	echo 1 >X &&
	git add X &&
	test_chmod +x A &&
	test_tick &&
	git commit -m modechange &&
	GIT_TRACE=1 git rebase main
'

test_expect_success 'rebase is not broken by diff.renames' '
	test_config diff.renames copies &&
	git checkout filemove &&
	GIT_TRACE=1 git rebase force-3way
'

test_expect_success 'setup: recover' '
	test_might_fail git rebase --abort &&
	git reset --hard &&
	git checkout modechange
'

test_expect_success 'Show verbose error when HEAD could not be detached' '
	>B &&
	test_when_finished "rm -f B" &&
	test_must_fail git rebase topic 2>output.err >output.out &&
	test_i18ngrep "The following untracked working tree files would be overwritten by checkout:" output.err &&
	test_i18ngrep B output.err
'

test_expect_success 'fail when upstream arg is missing and not on branch' '
	git checkout topic &&
	test_must_fail git rebase
'

test_expect_success 'fail when upstream arg is missing and not configured' '
	git checkout -b no-config topic &&
	test_must_fail git rebase
'

test_expect_success 'rebase works with format.useAutoBase' '
	test_config format.useAutoBase true &&
	git checkout topic &&
	git rebase main
'

test_expect_success 'default to common base in @{upstream}s reflog if no upstream arg (--merge)' '
	git checkout -b default-base main &&
	git checkout -b default topic &&
	git config branch.default.remote . &&
	git config branch.default.merge refs/heads/default-base &&
	git rebase --merge &&
	git rev-parse --verify default-base >expect &&
	git rev-parse default~1 >actual &&
	test_cmp expect actual &&
	git checkout default-base &&
	git reset --hard HEAD^ &&
	git checkout default &&
	git rebase --merge &&
	git rev-parse --verify default-base >expect &&
	git rev-parse default~1 >actual &&
	test_cmp expect actual
'

test_expect_success 'default to common base in @{upstream}s reflog if no upstream arg (--apply)' '
	git checkout -B default-base main &&
	git checkout -B default topic &&
	git config branch.default.remote . &&
	git config branch.default.merge refs/heads/default-base &&
	git rebase --apply &&
	git rev-parse --verify default-base >expect &&
	git rev-parse default~1 >actual &&
	test_cmp expect actual &&
	git checkout default-base &&
	git reset --hard HEAD^ &&
	git checkout default &&
	git rebase --apply &&
	git rev-parse --verify default-base >expect &&
	git rev-parse default~1 >actual &&
	test_cmp expect actual
'

test_expect_success 'cherry-picked commits and fork-point work together' '
	git checkout default-base &&
	echo Amended >A &&
	git commit -a --no-edit --amend &&
	test_commit B B &&
	test_commit new_B B "New B" &&
	test_commit C C &&
	git checkout default &&
	git reset --hard default-base@{4} &&
	test_commit D D &&
	git cherry-pick -2 default-base^ &&
	test_commit final_B B "Final B" &&
	git rebase &&
	echo Amended >expect &&
	test_cmp expect A &&
	echo "Final B" >expect &&
	test_cmp expect B &&
	echo C >expect &&
	test_cmp expect C &&
	echo D >expect &&
	test_cmp expect D
'

test_expect_success 'rebase --apply -q is quiet' '
	git checkout -b quiet topic &&
	git rebase --apply -q main >output.out 2>&1 &&
	test_must_be_empty output.out
'

test_expect_success 'rebase --merge -q is quiet' '
	git checkout -B quiet topic &&
	git rebase --merge -q main >output.out 2>&1 &&
	test_must_be_empty output.out
'

test_expect_success 'Rebase a commit that sprinkles CRs in' '
	(
		echo "One" &&
		echo "TwoQ" &&
		echo "Three" &&
		echo "FQur" &&
		echo "Five"
	) | q_to_cr >CR &&
	git add CR &&
	test_tick &&
	git commit -a -m "A file with a line with CR" &&
	git tag file-with-cr &&
	git checkout HEAD^0 &&
	git rebase --onto HEAD^^ HEAD^ &&
	git diff --exit-code file-with-cr:CR HEAD:CR
'

test_expect_success 'rebase can copy notes' '
	git config notes.rewrite.rebase true &&
	git config notes.rewriteRef "refs/notes/*" &&
	test_commit n1 &&
	test_commit n2 &&
	test_commit n3 &&
	git notes add -m"a note" n3 &&
	git rebase --onto n1 n2 &&
	test "a note" = "$(git notes show HEAD)"
'

test_expect_success 'rebase -m can copy notes' '
	git reset --hard n3 &&
	git rebase -m --onto n1 n2 &&
	test "a note" = "$(git notes show HEAD)"
'

test_expect_success 'rebase commit with an ancient timestamp' '
	git reset --hard &&

	>old.one && git add old.one && test_tick &&
	git commit --date="@12345 +0400" -m "Old one" &&
	>old.two && git add old.two && test_tick &&
	git commit --date="@23456 +0500" -m "Old two" &&
	>old.three && git add old.three && test_tick &&
	git commit --date="@34567 +0600" -m "Old three" &&

	git cat-file commit HEAD^^ >actual &&
	grep "author .* 12345 +0400$" actual &&
	git cat-file commit HEAD^ >actual &&
	grep "author .* 23456 +0500$" actual &&
	git cat-file commit HEAD >actual &&
	grep "author .* 34567 +0600$" actual &&

	git rebase --onto HEAD^^ HEAD^ &&

	git cat-file commit HEAD >actual &&
	grep "author .* 34567 +0600$" actual
'

test_expect_success 'rebase with "From " line in commit message' '
	git checkout -b preserve-from main~1 &&
	cat >From_.msg <<EOF &&
Somebody embedded an mbox in a commit message

This is from so-and-so:

From a@b Mon Sep 17 00:00:00 2001
From: John Doe <nobody@example.com>
Date: Sat, 11 Nov 2017 00:00:00 +0000
Subject: not this message

something
EOF
	>From_ &&
	git add From_ &&
	git commit -F From_.msg &&
	git rebase main &&
	git log -1 --pretty=format:%B >out &&
	test_cmp From_.msg out
'

test_expect_success 'rebase --apply and --show-current-patch' '
	test_create_repo conflict-apply &&
	(
		cd conflict-apply &&
		test_commit init &&
		echo one >>init.t &&
		git commit -a -m one &&
		echo two >>init.t &&
		git commit -a -m two &&
		git tag two &&
		test_must_fail git rebase --apply -f --onto init HEAD^ &&
		GIT_TRACE=1 git rebase --show-current-patch >/dev/null 2>stderr &&
		grep "show.*$(git rev-parse two)" stderr
	)
'

test_expect_success 'rebase --apply and .gitattributes' '
	test_create_repo attributes &&
	(
		cd attributes &&
		test_commit init &&
		git config filter.test.clean "sed -e '\''s/smudged/clean/g'\''" &&
		git config filter.test.smudge "sed -e '\''s/clean/smudged/g'\''" &&

		test_commit second &&
		git checkout -b test HEAD^ &&

		echo "*.txt filter=test" >.gitattributes &&
		git add .gitattributes &&
		test_commit third &&

		echo "This text is smudged." >a.txt &&
		git add a.txt &&
		test_commit fourth &&

		git checkout -b removal HEAD^ &&
		git rm .gitattributes &&
		git add -u &&
		test_commit fifth &&
		git cherry-pick test &&

		git checkout test &&
		git rebase main &&
		grep "smudged" a.txt &&

		git checkout removal &&
		git reset --hard &&
		git rebase main &&
		grep "clean" a.txt
	)
'

test_expect_success 'rebase--merge.sh and --show-current-patch' '
	test_create_repo conflict-merge &&
	(
		cd conflict-merge &&
		test_commit init &&
		echo one >>init.t &&
		git commit -a -m one &&
		echo two >>init.t &&
		git commit -a -m two &&
		git tag two &&
		test_must_fail git rebase --merge --onto init HEAD^ &&
		git rebase --show-current-patch >actual.patch &&
		GIT_TRACE=1 git rebase --show-current-patch >/dev/null 2>stderr &&
		grep "show.*REBASE_HEAD" stderr &&
		test "$(git rev-parse REBASE_HEAD)" = "$(git rev-parse two)"
	)
'

test_expect_success 'rebase -c rebase.useBuiltin=false warning' '
	expected="rebase.useBuiltin support has been removed" &&

	# Only warn when the legacy rebase is requested...
	test_must_fail git -c rebase.useBuiltin=false rebase 2>err &&
	test_i18ngrep "$expected" err &&
	test_must_fail env GIT_TEST_REBASE_USE_BUILTIN=false git rebase 2>err &&
	test_i18ngrep "$expected" err &&

	# ...not when we would have used the built-in anyway
	test_must_fail git -c rebase.useBuiltin=true rebase 2>err &&
	test_must_be_empty err &&
	test_must_fail env GIT_TEST_REBASE_USE_BUILTIN=true git rebase 2>err &&
	test_must_be_empty err
'

test_expect_success 'switch to branch checked out here' '
	git checkout main &&
	git rebase main main
'

test_expect_success 'switch to branch not checked out' '
	git checkout main &&
	git branch other &&
	git rebase main other
'

test_expect_success 'refuse to switch to branch checked out elsewhere' '
	git checkout main &&
	git worktree add wt &&
	test_must_fail git -C wt rebase main main 2>err &&
	test_i18ngrep "already checked out" err
'

test_done
Commit	Line	Data
294c695d AW	1	#!/bin/sh
	2	#
	3	# Copyright (c) 2005 Amos Waterland
	4	#
	5
c2ca1d79	6	test_description='git rebase assorted tests
294c695d	7
c2ca1d79 JH	8	This test runs git rebase and checks that the author information is not lost
c2ca1d79 JH	9	among other things.
294c695d	10	'
d1c02d93	11	GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
334afbc7 JS	12	export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
334afbc7 JS	13
294c695d AW	14	. ./test-lib.sh
294c695d AW	15
43c23251 JS	16	GIT_AUTHOR_NAME=author@name
	17	GIT_AUTHOR_EMAIL=bogus@email@address
	18	export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL
294c695d	19
e877a4c1 JN	20	test_expect_success 'prepare repository with topic branches' '
	21	git config core.logAllRefUpdates true &&
	22	echo First >A &&
	23	git update-index --add A &&
	24	git commit -m "Add A." &&
840b3ca7 JH	25	git checkout -b force-3way &&
	26	echo Dummy >Y &&
	27	git update-index --add Y &&
	28	git commit -m "Add Y." &&
	29	git checkout -b filemove &&
d1c02d93	30	git reset --soft main &&
840b3ca7 JH	31	mkdir D &&
	32	git mv A D/A &&
	33	git commit -m "Move A." &&
d1c02d93	34	git checkout -b my-topic-branch main &&
e877a4c1 JN	35	echo Second >B &&
	36	git update-index --add B &&
	37	git commit -m "Add B." &&
d1c02d93	38	git checkout -f main &&
e877a4c1 JN	39	echo Third >>A &&
	40	git update-index A &&
	41	git commit -m "Modify A." &&
	42	git checkout -b side my-topic-branch &&
	43	echo Side >>C &&
	44	git add C &&
	45	git commit -m "Add C" &&
e877a4c1 JN	46	git checkout -f my-topic-branch &&
e877a4c1 JN	47	git tag topic
1308c17b JS	48	'
1308c17b JS	49
7a7eb517	50	test_expect_success 'rebase on dirty worktree' '
e877a4c1	51	echo dirty >>A &&
d1c02d93	52	test_must_fail git rebase main
e877a4c1	53	'
7a7eb517 NTND	54
7a7eb517 NTND	55	test_expect_success 'rebase on dirty cache' '
e877a4c1	56	git add A &&
d1c02d93	57	test_must_fail git rebase main
e877a4c1	58	'
7a7eb517	59
d1c02d93	60	test_expect_success 'rebase against main' '
e877a4c1	61	git reset --hard HEAD &&
d1c02d93	62	git rebase main
e877a4c1	63	'
294c695d	64
cbd29ead	65	test_expect_success 'rebase sets ORIG_HEAD to pre-rebase state' '
c2d96293 JS	66	git checkout -b orig-head topic &&
c2d96293 JS	67	pre="$(git rev-parse --verify HEAD)" &&
d1c02d93	68	git rebase main &&
c2d96293	69	test_cmp_rev "$pre" ORIG_HEAD &&
2c9e125b	70	test_cmp_rev ! "$pre" HEAD
c2d96293 JS	71	'
c2d96293 JS	72
2e6e276d	73	test_expect_success 'rebase, with <onto> and <upstream> specified as :/quuxery' '
6567dc05 RR	74	test_when_finished "git branch -D torebase" &&
	75	git checkout -b torebase my-topic-branch^ &&
	76	upstream=$(git rev-parse ":/Add B") &&
	77	onto=$(git rev-parse ":/Add A") &&
	78	git rebase --onto $onto $upstream &&
	79	git reset --hard my-topic-branch^ &&
	80	git rebase --onto ":/Add A" ":/Add B" &&
	81	git checkout my-topic-branch
	82	'
	83
e877a4c1 JN	84	test_expect_success 'the rebase operation should not have destroyed author information' '
	85	! (git log \| grep "Author:" \| grep "<>")
	86	'
294c695d	87
e877a4c1 JN	88	test_expect_success 'the rebase operation should not have destroyed author information (2)' "
	89	git log -1 \|
	90	grep 'Author: $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>'
	91	"
43c23251	92
2559bff3	93	test_expect_success 'HEAD was detached during rebase' '
e877a4c1	94	test $(git rev-parse HEAD@{1}) != $(git rev-parse my-topic-branch@{1})
2559bff3 JS	95	'
2559bff3 JS	96
ea709800 PH	97	test_expect_success 'rebase from ambiguous branch name' '
ea709800 PH	98	git checkout -b topic side &&
d1c02d93	99	git rebase main
ea709800 PH	100	'
ea709800 PH	101
4f407407	102	test_expect_success 'rebase off of the previous branch using "-"' '
d1c02d93	103	git checkout main &&
4f407407 BG	104	git checkout HEAD^ &&
4f407407 BG	105	git rebase @{-1} >expect.messages &&
d1c02d93	106	git merge-base main HEAD >expect.forkpoint &&
4f407407	107
d1c02d93	108	git checkout main &&
4f407407 BG	109	git checkout HEAD^ &&
4f407407 BG	110	git rebase - >actual.messages &&
d1c02d93	111	git merge-base main HEAD >actual.forkpoint &&
4f407407 BG	112
	113	test_cmp expect.forkpoint actual.forkpoint &&
	114	# the next one is dubious---we may want to say "-",
	115	# instead of @{-1}, in the message
1108cea7	116	test_cmp expect.messages actual.messages
4f407407 BG	117	'
4f407407 BG	118
ece7b749	119	test_expect_success 'rebase a single mode change' '
d1c02d93	120	git checkout main &&
3f213981	121	git branch -D topic &&
e877a4c1 JN	122	echo 1 >X &&
	123	git add X &&
	124	test_tick &&
	125	git commit -m prepare &&
	126	git checkout -b modechange HEAD^ &&
	127	echo 1 >X &&
	128	git add X &&
	129	test_chmod +x A &&
	130	test_tick &&
	131	git commit -m modechange &&
d1c02d93	132	GIT_TRACE=1 git rebase main
ece7b749 JS	133	'
ece7b749 JS	134
840b3ca7	135	test_expect_success 'rebase is not broken by diff.renames' '
55adef06	136	test_config diff.renames copies &&
840b3ca7 JH	137	git checkout filemove &&
	138	GIT_TRACE=1 git rebase force-3way
	139	'
	140
	141	test_expect_success 'setup: recover' '
	142	test_might_fail git rebase --abort &&
	143	git reset --hard &&
	144	git checkout modechange
	145	'
	146
3ec7371f	147	test_expect_success 'Show verbose error when HEAD could not be detached' '
e877a4c1	148	>B &&
df126ca1	149	test_when_finished "rm -f B" &&
e877a4c1	150	test_must_fail git rebase topic 2>output.err >output.out &&
e5c1272c VA	151	test_i18ngrep "The following untracked working tree files would be overwritten by checkout:" output.err &&
e5c1272c VA	152	test_i18ngrep B output.err
3ec7371f	153	'
bffd750a	154
15a147e6 MZ	155	test_expect_success 'fail when upstream arg is missing and not on branch' '
15a147e6 MZ	156	git checkout topic &&
3c02396a	157	test_must_fail git rebase
15a147e6 MZ	158	'
	159
	160	test_expect_success 'fail when upstream arg is missing and not configured' '
	161	git checkout -b no-config topic &&
3c02396a	162	test_must_fail git rebase
15a147e6 MZ	163	'
15a147e6 MZ	164
cae0bc09	165	test_expect_success 'rebase works with format.useAutoBase' '
0c47e061 DL	166	test_config format.useAutoBase true &&
0c47e061 DL	167	git checkout topic &&
d1c02d93	168	git rebase main
0c47e061 DL	169	'
0c47e061 DL	170
93122c98	171	test_expect_success 'default to common base in @{upstream}s reflog if no upstream arg (--merge)' '
d1c02d93	172	git checkout -b default-base main &&
15a147e6	173	git checkout -b default topic &&
02380389	174	git config branch.default.remote . &&
bb3f4583	175	git config branch.default.merge refs/heads/default-base &&
93122c98 EN	176	git rebase --merge &&
	177	git rev-parse --verify default-base >expect &&
	178	git rev-parse default~1 >actual &&
	179	test_cmp expect actual &&
	180	git checkout default-base &&
	181	git reset --hard HEAD^ &&
	182	git checkout default &&
	183	git rebase --merge &&
	184	git rev-parse --verify default-base >expect &&
	185	git rev-parse default~1 >actual &&
	186	test_cmp expect actual
	187	'
	188
10cdb9f3	189	test_expect_success 'default to common base in @{upstream}s reflog if no upstream arg (--apply)' '
d1c02d93	190	git checkout -B default-base main &&
93122c98 EN	191	git checkout -B default topic &&
	192	git config branch.default.remote . &&
	193	git config branch.default.merge refs/heads/default-base &&
10cdb9f3	194	git rebase --apply &&
bb3f4583 JK	195	git rev-parse --verify default-base >expect &&
	196	git rev-parse default~1 >actual &&
	197	test_cmp expect actual &&
	198	git checkout default-base &&
	199	git reset --hard HEAD^ &&
	200	git checkout default &&
10cdb9f3	201	git rebase --apply &&
bb3f4583	202	git rev-parse --verify default-base >expect &&
ad8261d2 JK	203	git rev-parse default~1 >actual &&
ad8261d2 JK	204	test_cmp expect actual
bffd750a	205	'
3ec7371f	206
1e0dacdb JK	207	test_expect_success 'cherry-picked commits and fork-point work together' '
	208	git checkout default-base &&
	209	echo Amended >A &&
	210	git commit -a --no-edit --amend &&
	211	test_commit B B &&
	212	test_commit new_B B "New B" &&
	213	test_commit C C &&
	214	git checkout default &&
	215	git reset --hard default-base@{4} &&
	216	test_commit D D &&
	217	git cherry-pick -2 default-base^ &&
	218	test_commit final_B B "Final B" &&
	219	git rebase &&
	220	echo Amended >expect &&
dcbaa0b3	221	test_cmp expect A &&
1e0dacdb	222	echo "Final B" >expect &&
dcbaa0b3	223	test_cmp expect B &&
1e0dacdb	224	echo C >expect &&
dcbaa0b3	225	test_cmp expect C &&
1e0dacdb	226	echo D >expect &&
dcbaa0b3	227	test_cmp expect D
1e0dacdb JK	228	'
1e0dacdb JK	229
10cdb9f3	230	test_expect_success 'rebase --apply -q is quiet' '
e877a4c1	231	git checkout -b quiet topic &&
d1c02d93	232	git rebase --apply -q main >output.out 2>&1 &&
ca8d148d	233	test_must_be_empty output.out
0e987a12 SB	234	'
0e987a12 SB	235
55d2b6d7 EN	236	test_expect_success 'rebase --merge -q is quiet' '
55d2b6d7 EN	237	git checkout -B quiet topic &&
d1c02d93	238	git rebase --merge -q main >output.out 2>&1 &&
55d2b6d7 EN	239	test_must_be_empty output.out
	240	'
	241
c2ca1d79 JH	242	test_expect_success 'Rebase a commit that sprinkles CRs in' '
c2ca1d79 JH	243	(
3ea67379 ES	244	echo "One" &&
	245	echo "TwoQ" &&
	246	echo "Three" &&
	247	echo "FQur" &&
c2ca1d79 JH	248	echo "Five"
	249	) \| q_to_cr >CR &&
	250	git add CR &&
	251	test_tick &&
	252	git commit -a -m "A file with a line with CR" &&
	253	git tag file-with-cr &&
	254	git checkout HEAD^0 &&
	255	git rebase --onto HEAD^^ HEAD^ &&
	256	git diff --exit-code file-with-cr:CR HEAD:CR
	257	'
	258
eb2151bb TR	259	test_expect_success 'rebase can copy notes' '
	260	git config notes.rewrite.rebase true &&
	261	git config notes.rewriteRef "refs/notes/*" &&
	262	test_commit n1 &&
	263	test_commit n2 &&
	264	test_commit n3 &&
	265	git notes add -m"a note" n3 &&
	266	git rebase --onto n1 n2 &&
	267	test "a note" = "$(git notes show HEAD)"
	268	'
	269
	270	test_expect_success 'rebase -m can copy notes' '
	271	git reset --hard n3 &&
	272	git rebase -m --onto n1 n2 &&
	273	test "a note" = "$(git notes show HEAD)"
	274	'
	275
2c733fb2 JH	276	test_expect_success 'rebase commit with an ancient timestamp' '
	277	git reset --hard &&
	278
	279	>old.one && git add old.one && test_tick &&
	280	git commit --date="@12345 +0400" -m "Old one" &&
	281	>old.two && git add old.two && test_tick &&
	282	git commit --date="@23456 +0500" -m "Old two" &&
	283	>old.three && git add old.three && test_tick &&
	284	git commit --date="@34567 +0600" -m "Old three" &&
	285
	286	git cat-file commit HEAD^^ >actual &&
	287	grep "author .* 12345 +0400$" actual &&
	288	git cat-file commit HEAD^ >actual &&
	289	grep "author .* 23456 +0500$" actual &&
	290	git cat-file commit HEAD >actual &&
	291	grep "author .* 34567 +0600$" actual &&
	292
	293	git rebase --onto HEAD^^ HEAD^ &&
	294
	295	git cat-file commit HEAD >actual &&
	296	grep "author .* 34567 +0600$" actual
	297	'
	298
ae3b2b04	299	test_expect_success 'rebase with "From " line in commit message' '
d1c02d93	300	git checkout -b preserve-from main~1 &&
ae3b2b04 EW	301	cat >From_.msg <<EOF &&
	302	Somebody embedded an mbox in a commit message
	303
	304	This is from so-and-so:
	305
	306	From a@b Mon Sep 17 00:00:00 2001
	307	From: John Doe <nobody@example.com>
	308	Date: Sat, 11 Nov 2017 00:00:00 +0000
	309	Subject: not this message
	310
	311	something
	312	EOF
	313	>From_ &&
	314	git add From_ &&
	315	git commit -F From_.msg &&
d1c02d93	316	git rebase main &&
ae3b2b04 EW	317	git log -1 --pretty=format:%B >out &&
	318	test_cmp From_.msg out
	319	'
	320
10cdb9f3	321	test_expect_success 'rebase --apply and --show-current-patch' '
66335298 NTND	322	test_create_repo conflict-apply &&
	323	(
	324	cd conflict-apply &&
	325	test_commit init &&
	326	echo one >>init.t &&
	327	git commit -a -m one &&
	328	echo two >>init.t &&
	329	git commit -a -m two &&
	330	git tag two &&
10cdb9f3	331	test_must_fail git rebase --apply -f --onto init HEAD^ &&
66335298 NTND	332	GIT_TRACE=1 git rebase --show-current-patch >/dev/null 2>stderr &&
	333	grep "show.*$(git rev-parse two)" stderr
	334	)
	335	'
	336
10cdb9f3	337	test_expect_success 'rebase --apply and .gitattributes' '
2c65d90f	338	test_create_repo attributes &&
	339	(
	340	cd attributes &&
	341	test_commit init &&
	342	git config filter.test.clean "sed -e '\''s/smudged/clean/g'\''" &&
	343	git config filter.test.smudge "sed -e '\''s/clean/smudged/g'\''" &&
	344
	345	test_commit second &&
	346	git checkout -b test HEAD^ &&
	347
	348	echo "*.txt filter=test" >.gitattributes &&
	349	git add .gitattributes &&
	350	test_commit third &&
	351
	352	echo "This text is smudged." >a.txt &&
	353	git add a.txt &&
	354	test_commit fourth &&
	355
	356	git checkout -b removal HEAD^ &&
	357	git rm .gitattributes &&
	358	git add -u &&
	359	test_commit fifth &&
	360	git cherry-pick test &&
	361
	362	git checkout test &&
d1c02d93	363	git rebase main &&
2c65d90f	364	grep "smudged" a.txt &&
	365
	366	git checkout removal &&
	367	git reset --hard &&
d1c02d93	368	git rebase main &&
2c65d90f	369	grep "clean" a.txt
	370	)
	371	'
	372
66335298 NTND	373	test_expect_success 'rebase--merge.sh and --show-current-patch' '
	374	test_create_repo conflict-merge &&
	375	(
	376	cd conflict-merge &&
	377	test_commit init &&
	378	echo one >>init.t &&
	379	git commit -a -m one &&
	380	echo two >>init.t &&
	381	git commit -a -m two &&
	382	git tag two &&
	383	test_must_fail git rebase --merge --onto init HEAD^ &&
	384	git rebase --show-current-patch >actual.patch &&
	385	GIT_TRACE=1 git rebase --show-current-patch >/dev/null 2>stderr &&
fbd7a232 NTND	386	grep "show.*REBASE_HEAD" stderr &&
fbd7a232 NTND	387	test "$(git rev-parse REBASE_HEAD)" = "$(git rev-parse two)"
66335298 NTND	388	)
	389	'
	390
d03ebd41 ÆAB	391	test_expect_success 'rebase -c rebase.useBuiltin=false warning' '
	392	expected="rebase.useBuiltin support has been removed" &&
	393
	394	# Only warn when the legacy rebase is requested...
	395	test_must_fail git -c rebase.useBuiltin=false rebase 2>err &&
	396	test_i18ngrep "$expected" err &&
	397	test_must_fail env GIT_TEST_REBASE_USE_BUILTIN=false git rebase 2>err &&
	398	test_i18ngrep "$expected" err &&
	399
	400	# ...not when we would have used the built-in anyway
	401	test_must_fail git -c rebase.useBuiltin=true rebase 2>err &&
	402	test_must_be_empty err &&
	403	test_must_fail env GIT_TEST_REBASE_USE_BUILTIN=true git rebase 2>err &&
	404	test_must_be_empty err
	405	'
	406
b5cabb4a	407	test_expect_success 'switch to branch checked out here' '
d1c02d93 JS	408	git checkout main &&
d1c02d93 JS	409	git rebase main main
b5cabb4a ES	410	'
	411
	412	test_expect_success 'switch to branch not checked out' '
d1c02d93	413	git checkout main &&
b5cabb4a	414	git branch other &&
d1c02d93	415	git rebase main other
b5cabb4a ES	416	'
	417
	418	test_expect_success 'refuse to switch to branch checked out elsewhere' '
d1c02d93	419	git checkout main &&
b5cabb4a	420	git worktree add wt &&
d1c02d93	421	test_must_fail git -C wt rebase main main 2>err &&
b5cabb4a ES	422	test_i18ngrep "already checked out" err
	423	'
	424
294c695d	425	test_done