summaryrefslogtreecommitdiff
path: root/t/t3424-rebase-empty.sh
blob: e1e30517ea646c56f6653c70b41968ca8c6222ed (plain)
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
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
#!/bin/sh
 
test_description='git rebase of commits that start or become empty'
 
. ./test-lib.sh
 
test_expect_success 'setup test repository' '
	test_write_lines 1 2 3 4 5 6 7 8 9 10 >numbers &&
	test_write_lines A B C D E F G H I J >letters &&
	git add numbers letters &&
	git commit -m A &&
 
	git branch upstream &&
	git branch localmods &&
 
	git checkout upstream &&
	test_write_lines A B C D E >letters &&
	git add letters &&
	git commit -m B &&
 
	test_write_lines 1 2 3 4 five 6 7 8 9 ten >numbers &&
	git add numbers &&
	git commit -m C &&
 
	git checkout localmods &&
	test_write_lines 1 2 3 4 five 6 7 8 9 10 >numbers &&
	git add numbers &&
	git commit -m C2 &&
 
	git commit --allow-empty -m D &&
 
	test_write_lines A B C D E >letters &&
	git add letters &&
	git commit -m "Five letters ought to be enough for anybody"
'
 
test_expect_failure 'rebase (apply-backend)' '
	test_when_finished "git rebase --abort" &&
	git checkout -B testing localmods &&
	# rebase (--apply) should not drop commits that start empty
	git rebase --apply upstream &&
 
	test_write_lines D C B A >expect &&
	git log --format=%s >actual &&
	test_cmp expect actual
'
 
test_expect_success 'rebase --merge --empty=drop' '
	git checkout -B testing localmods &&
	git rebase --merge --empty=drop upstream &&
 
	test_write_lines D C B A >expect &&
	git log --format=%s >actual &&
	test_cmp expect actual
'
 
test_expect_success 'rebase --merge uses default of --empty=drop' '
	git checkout -B testing localmods &&
	git rebase --merge upstream &&
 
	test_write_lines D C B A >expect &&
	git log --format=%s >actual &&
	test_cmp expect actual
'
 
test_expect_success 'rebase --merge --empty=keep' '
	git checkout -B testing localmods &&
	git rebase --merge --empty=keep upstream &&
 
	test_write_lines D C2 C B A >expect &&
	git log --format=%s >actual &&
	test_cmp expect actual
'
 
test_expect_success 'rebase --merge --empty=ask' '
	git checkout -B testing localmods &&
	test_must_fail git rebase --merge --empty=ask upstream &&
 
	git rebase --skip &&
 
	test_write_lines D C B A >expect &&
	git log --format=%s >actual &&
	test_cmp expect actual
'
 
test_expect_success 'rebase --interactive --empty=drop' '
	git checkout -B testing localmods &&
	git rebase --interactive --empty=drop upstream &&
 
	test_write_lines D C B A >expect &&
	git log --format=%s >actual &&
	test_cmp expect actual
'
 
test_expect_success 'rebase --interactive --empty=keep' '
	git checkout -B testing localmods &&
	git rebase --interactive --empty=keep upstream &&
 
	test_write_lines D C2 C B A >expect &&
	git log --format=%s >actual &&
	test_cmp expect actual
'
 
test_expect_success 'rebase --interactive --empty=ask' '
	git checkout -B testing localmods &&
	test_must_fail git rebase --interactive --empty=ask upstream &&
 
	git rebase --skip &&
 
	test_write_lines D C B A >expect &&
	git log --format=%s >actual &&
	test_cmp expect actual
'
 
test_expect_success 'rebase --interactive uses default of --empty=ask' '
	git checkout -B testing localmods &&
	test_must_fail git rebase --interactive upstream &&
 
	git rebase --skip &&
 
	test_write_lines D C B A >expect &&
	git log --format=%s >actual &&
	test_cmp expect actual
'
 
test_expect_success 'rebase --merge does not leave state laying around' '
	git checkout -B testing localmods~2 &&
	git rebase --merge upstream &&
 
	test_path_is_missing .git/CHERRY_PICK_HEAD &&
	test_path_is_missing .git/MERGE_MSG
'
 
test_done