git@vger.kernel.org mailing list mirror (one of many)

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
 #!/bin/sh

test_description='test cherry-picking (and reverting) a root commit'

. ./test-lib.sh

test_expect_success setup '

	echo first > file1 &&
	git add file1 &&
	test_tick &&
	git commit -m "first" &&

	git symbolic-ref HEAD refs/heads/second &&
	rm .git/index file1 &&
	echo second > file2 &&
	git add file2 &&
	test_tick &&
	git commit -m "second" &&

	git symbolic-ref HEAD refs/heads/third &&
	rm .git/index file2 &&
	echo third > file3 &&
	git add file3 &&
	test_tick &&
	git commit -m "third"

'

test_expect_success 'cherry-pick a root commit' '

	git checkout second^0 &&
	git cherry-pick main &&
	echo first >expect &&
	test_cmp expect file1

'

test_expect_success 'revert a root commit' '

	git revert main &&
	test_path_is_missing file1

'

test_expect_success 'cherry-pick a root commit with an external strategy' '

	git cherry-pick --strategy=resolve main &&
	echo first >expect &&
	test_cmp expect file1

'

test_expect_success 'revert a root commit with an external strategy' '

	git revert --strategy=resolve main &&
	test_path_is_missing file1

'

test_expect_success 'cherry-pick two root commits' '

	echo first >expect.file1 &&
	echo second >expect.file2 &&
	echo third >expect.file3 &&

	git checkout second^0 &&
	git cherry-pick main third &&

	test_cmp expect.file1 file1 &&
	test_cmp expect.file2 file2 &&
	test_cmp expect.file3 file3 &&
	git rev-parse --verify HEAD^^ &&
	test_must_fail git rev-parse --verify HEAD^^^

'

test_done