]>
Commit | Line | Data |
---|---|---|
25e93250 DK |
1 | #!/bin/sh |
2 | ||
3 | test_description='git rebase --continue tests' | |
4 | ||
5 | . ./test-lib.sh | |
6 | ||
7 | . "$TEST_DIRECTORY"/lib-rebase.sh | |
8 | ||
9 | set_fake_editor | |
10 | ||
11 | test_expect_success 'setup' ' | |
12 | test_commit "commit-new-file-F1" F1 1 && | |
13 | test_commit "commit-new-file-F2" F2 2 && | |
14 | ||
15 | git checkout -b topic HEAD^ && | |
16 | test_commit "commit-new-file-F2-on-topic-branch" F2 22 && | |
17 | ||
18 | git checkout master | |
19 | ' | |
20 | ||
21 | test_expect_success 'interactive rebase --continue works with touched file' ' | |
22 | rm -fr .git/rebase-* && | |
23 | git reset --hard && | |
24 | git checkout master && | |
25 | ||
26 | FAKE_LINES="edit 1" git rebase -i HEAD^ && | |
0e496492 | 27 | test-tool chmtime =-60 F1 && |
25e93250 DK |
28 | git rebase --continue |
29 | ' | |
30 | ||
31 | test_expect_success 'non-interactive rebase --continue works with touched file' ' | |
32 | rm -fr .git/rebase-* && | |
33 | git reset --hard && | |
34 | git checkout master && | |
35 | ||
36 | test_must_fail git rebase --onto master master topic && | |
37 | echo "Resolved" >F2 && | |
38 | git add F2 && | |
0e496492 | 39 | test-tool chmtime =-60 F1 && |
25e93250 DK |
40 | git rebase --continue |
41 | ' | |
42 | ||
95135b06 MZ |
43 | test_expect_success 'rebase --continue can not be used with other options' ' |
44 | test_must_fail git rebase -v --continue && | |
45 | test_must_fail git rebase --continue -v | |
46 | ' | |
47 | ||
80ff4795 MZ |
48 | test_expect_success 'rebase --continue remembers merge strategy and options' ' |
49 | rm -fr .git/rebase-* && | |
50 | git reset --hard commit-new-file-F2-on-topic-branch && | |
51 | test_commit "commit-new-file-F3-on-topic-branch" F3 32 && | |
52 | test_when_finished "rm -fr test-bin funny.was.run" && | |
53 | mkdir test-bin && | |
02380389 | 54 | cat >test-bin/git-merge-funny <<-EOF && |
80ff4795 MZ |
55 | #!$SHELL_PATH |
56 | case "\$1" in --opt) ;; *) exit 2 ;; esac | |
57 | shift && | |
58 | >funny.was.run && | |
59 | exec git merge-recursive "\$@" | |
60 | EOF | |
61 | chmod +x test-bin/git-merge-funny && | |
62 | ( | |
3ea67379 | 63 | PATH=./test-bin:$PATH && |
80ff4795 MZ |
64 | test_must_fail git rebase -s funny -Xopt master topic |
65 | ) && | |
66 | test -f funny.was.run && | |
67 | rm funny.was.run && | |
68 | echo "Resolved" >F2 && | |
69 | git add F2 && | |
70 | ( | |
3ea67379 | 71 | PATH=./test-bin:$PATH && |
80ff4795 MZ |
72 | git rebase --continue |
73 | ) && | |
74 | test -f funny.was.run | |
75 | ' | |
dd6fb005 | 76 | |
0060041d | 77 | test_expect_success 'rebase -i --continue handles merge strategy and options' ' |
a5a959d9 EN |
78 | rm -fr .git/rebase-* && |
79 | git reset --hard commit-new-file-F2-on-topic-branch && | |
80 | test_commit "commit-new-file-F3-on-topic-branch-for-dash-i" F3 32 && | |
81 | test_when_finished "rm -fr test-bin funny.was.run funny.args" && | |
82 | mkdir test-bin && | |
83 | cat >test-bin/git-merge-funny <<-EOF && | |
84 | #!$SHELL_PATH | |
85 | echo "\$@" >>funny.args | |
86 | case "\$1" in --opt) ;; *) exit 2 ;; esac | |
87 | case "\$2" in --foo) ;; *) exit 2 ;; esac | |
88 | case "\$4" in --) ;; *) exit 2 ;; esac | |
89 | shift 2 && | |
90 | >funny.was.run && | |
91 | exec git merge-recursive "\$@" | |
92 | EOF | |
93 | chmod +x test-bin/git-merge-funny && | |
94 | ( | |
95 | PATH=./test-bin:$PATH && | |
96 | test_must_fail git rebase -i -s funny -Xopt -Xfoo master topic | |
97 | ) && | |
98 | test -f funny.was.run && | |
99 | rm funny.was.run && | |
100 | echo "Resolved" >F2 && | |
101 | git add F2 && | |
102 | ( | |
103 | PATH=./test-bin:$PATH && | |
104 | git rebase --continue | |
105 | ) && | |
106 | test -f funny.was.run | |
107 | ' | |
108 | ||
11aad464 | 109 | test_expect_success REBASE_P 'rebase passes merge strategy options correctly' ' |
dd6fb005 JS |
110 | rm -fr .git/rebase-* && |
111 | git reset --hard commit-new-file-F3-on-topic-branch && | |
112 | test_commit theirs-to-merge && | |
113 | git reset --hard HEAD^ && | |
114 | test_commit some-commit && | |
115 | test_tick && | |
116 | git merge --no-ff theirs-to-merge && | |
117 | FAKE_LINES="1 edit 2 3" git rebase -i -f -p -m \ | |
118 | -s recursive --strategy-option=theirs HEAD~2 && | |
119 | test_commit force-change && | |
120 | git rebase --continue | |
121 | ' | |
d5bc6f29 | 122 | |
15ef6931 | 123 | test_expect_success '--skip after failed fixup cleans commit message' ' |
d5bc6f29 JS |
124 | test_when_finished "test_might_fail git rebase --abort" && |
125 | git checkout -b with-conflicting-fixup && | |
126 | test_commit wants-fixup && | |
127 | test_commit "fixup! wants-fixup" wants-fixup.t 1 wants-fixup-1 && | |
128 | test_commit "fixup! wants-fixup" wants-fixup.t 2 wants-fixup-2 && | |
129 | test_commit "fixup! wants-fixup" wants-fixup.t 3 wants-fixup-3 && | |
15ef6931 | 130 | test_must_fail env FAKE_LINES="1 fixup 2 squash 4" \ |
d5bc6f29 JS |
131 | git rebase -i HEAD~4 && |
132 | ||
133 | : now there is a conflict, and comments in the commit message && | |
134 | git show HEAD >out && | |
135 | grep "fixup! wants-fixup" out && | |
136 | ||
137 | : skip and continue && | |
15ef6931 JS |
138 | echo "cp \"\$1\" .git/copy.txt" | write_script copy-editor.sh && |
139 | (test_set_editor "$PWD/copy-editor.sh" && git rebase --skip) && | |
140 | ||
141 | : the user should not have had to edit the commit message && | |
142 | test_path_is_missing .git/copy.txt && | |
d5bc6f29 JS |
143 | |
144 | : now the comments in the commit message should have been cleaned up && | |
145 | git show HEAD >out && | |
15ef6931 JS |
146 | ! grep "fixup! wants-fixup" out && |
147 | ||
148 | : now, let us ensure that "squash" is handled correctly && | |
149 | git reset --hard wants-fixup-3 && | |
150 | test_must_fail env FAKE_LINES="1 squash 4 squash 2 squash 4" \ | |
151 | git rebase -i HEAD~4 && | |
152 | ||
153 | : the first squash failed, but there are two more in the chain && | |
154 | (test_set_editor "$PWD/copy-editor.sh" && | |
155 | test_must_fail git rebase --skip) && | |
156 | ||
157 | : not the final squash, no need to edit the commit message && | |
158 | test_path_is_missing .git/copy.txt && | |
159 | ||
160 | : The first squash was skipped, therefore: && | |
161 | git show HEAD >out && | |
162 | test_i18ngrep "# This is a combination of 2 commits" out && | |
dd2e36eb | 163 | test_i18ngrep "# This is the commit message #2:" out && |
15ef6931 JS |
164 | |
165 | (test_set_editor "$PWD/copy-editor.sh" && git rebase --skip) && | |
166 | git show HEAD >out && | |
167 | test_i18ngrep ! "# This is a combination" out && | |
168 | ||
169 | : Final squash failed, but there was still a squash && | |
dd2e36eb PW |
170 | test_i18ngrep "# This is a combination of 2 commits" .git/copy.txt && |
171 | test_i18ngrep "# This is the commit message #2:" .git/copy.txt | |
d5bc6f29 | 172 | ' |
80ff4795 | 173 | |
5fb415b5 | 174 | test_expect_success 'setup rerere database' ' |
b3e4847e MZ |
175 | rm -fr .git/rebase-* && |
176 | git reset --hard commit-new-file-F3-on-topic-branch && | |
02380389 | 177 | git checkout master && |
b3e4847e | 178 | test_commit "commit-new-file-F3" F3 3 && |
5fb415b5 | 179 | test_config rerere.enabled true && |
5ee4ef8b | 180 | git update-ref refs/heads/topic commit-new-file-F3-on-topic-branch && |
b3e4847e MZ |
181 | test_must_fail git rebase -m master topic && |
182 | echo "Resolved" >F2 && | |
5fb415b5 | 183 | cp F2 expected-F2 && |
b3e4847e MZ |
184 | git add F2 && |
185 | test_must_fail git rebase --continue && | |
186 | echo "Resolved" >F3 && | |
5fb415b5 | 187 | cp F3 expected-F3 && |
b3e4847e MZ |
188 | git add F3 && |
189 | git rebase --continue && | |
5fb415b5 | 190 | git reset --hard topic@{1} |
b3e4847e MZ |
191 | ' |
192 | ||
5fb415b5 PW |
193 | prepare () { |
194 | rm -fr .git/rebase-* && | |
195 | git reset --hard commit-new-file-F3-on-topic-branch && | |
196 | git checkout master && | |
197 | test_config rerere.enabled true | |
198 | } | |
199 | ||
200 | test_rerere_autoupdate () { | |
201 | action=$1 && | |
202 | test_expect_success "rebase $action --continue remembers --rerere-autoupdate" ' | |
203 | prepare && | |
204 | test_must_fail git rebase $action --rerere-autoupdate master topic && | |
205 | test_cmp expected-F2 F2 && | |
206 | git diff-files --quiet && | |
207 | test_must_fail git rebase --continue && | |
208 | test_cmp expected-F3 F3 && | |
209 | git diff-files --quiet && | |
210 | git rebase --continue | |
211 | ' | |
212 | ||
213 | test_expect_success "rebase $action --continue honors rerere.autoUpdate" ' | |
214 | prepare && | |
215 | test_config rerere.autoupdate true && | |
216 | test_must_fail git rebase $action master topic && | |
217 | test_cmp expected-F2 F2 && | |
218 | git diff-files --quiet && | |
219 | test_must_fail git rebase --continue && | |
220 | test_cmp expected-F3 F3 && | |
221 | git diff-files --quiet && | |
222 | git rebase --continue | |
223 | ' | |
224 | ||
225 | test_expect_success "rebase $action --continue remembers --no-rerere-autoupdate" ' | |
226 | prepare && | |
227 | test_config rerere.autoupdate true && | |
228 | test_must_fail git rebase $action --no-rerere-autoupdate master topic && | |
229 | test_cmp expected-F2 F2 && | |
230 | test_must_fail git diff-files --quiet && | |
231 | git add F2 && | |
232 | test_must_fail git rebase --continue && | |
233 | test_cmp expected-F3 F3 && | |
234 | test_must_fail git diff-files --quiet && | |
235 | git add F3 && | |
236 | git rebase --continue | |
237 | ' | |
238 | } | |
239 | ||
240 | test_rerere_autoupdate | |
241 | test_rerere_autoupdate -m | |
9b6d7a62 PW |
242 | GIT_SEQUENCE_EDITOR=: && export GIT_SEQUENCE_EDITOR |
243 | test_rerere_autoupdate -i | |
11aad464 | 244 | test_have_prereq !REBASE_P || test_rerere_autoupdate --preserve-merges |
5fb415b5 | 245 | |
25e93250 | 246 | test_done |