3 # Copyright (c) 2007 Johannes E. Schindelin
6 test_description='git rebase interactive
8 This test runs git rebase "interactively", by faking an edit, and verifies
9 that the result still makes sense.
13 # set up two branches like this:
21 # where B, D and G touch the same file.
23 test_expect_success 'setup' '
31 git commit -m B file1 &&
38 git commit -m D file1 &&
43 git checkout -b branch1 A &&
51 git commit -m G file1 &&
56 git checkout -b branch2 F &&
64 cat > fake-editor.sh << EOF
66 test "\$1" = .git/COMMIT_EDITMSG && {
67 test -z "\$FAKE_COMMIT_MESSAGE" || echo "\$FAKE_COMMIT_MESSAGE" > "\$1"
68 test -z "\$FAKE_COMMIT_AMEND" || echo "\$FAKE_COMMIT_AMEND" >> "\$1"
71 test -z "\$EXPECT_COUNT" ||
72 test "\$EXPECT_COUNT" = \$(grep -ve "^#" -e "^$" < "\$1" | wc -l) ||
74 test -z "\$FAKE_LINES" && exit
75 grep -v "^#" < "\$1" > "\$1".tmp
79 for line in \$FAKE_LINES; do
84 echo sed -n "\${line}s/^pick/\$action/p"
85 sed -n "\${line}p" < "\$1".tmp
86 sed -n "\${line}s/^pick/\$action/p" < "\$1".tmp >> "\$1"
92 chmod a+x fake-editor.sh
93 VISUAL="$(pwd)/fake-editor.sh"
96 test_expect_success 'no changes are a nop' '
98 test $(git rev-parse I) = $(git rev-parse HEAD)
101 test_expect_success 'rebase on top of a non-conflicting commit' '
102 git checkout branch1 &&
103 git tag original-branch1 &&
104 git rebase -i branch2 &&
105 test file6 = $(git diff --name-only original-branch1) &&
106 test $(git rev-parse I) = $(git rev-parse HEAD~2)
109 test_expect_success 'reflog for the branch shows state before rebase' '
110 test $(git rev-parse branch1@{1}) = $(git rev-parse original-branch1)
113 test_expect_success 'exchange two commits' '
114 FAKE_LINES="2 1" git rebase -i HEAD~2 &&
115 test H = $(git cat-file commit HEAD^ | tail -n 1) &&
116 test G = $(git cat-file commit HEAD | tail -n 1)
120 diff --git a/file1 b/file1
121 index e69de29..00750ed 100644
133 >>>>>>> b7ca976... G:file1
136 test_expect_success 'stop on conflicting pick' '
137 git tag new-branch1 &&
138 ! git rebase -i master &&
139 diff -u expect .git/.dotest-merge/patch &&
140 diff -u expect2 file1 &&
141 test 4 = $(grep -v "^#" < .git/.dotest-merge/done | wc -l) &&
142 test 0 = $(grep -v "^#" < .git/.dotest-merge/todo | wc -l)
145 test_expect_success 'abort' '
146 git rebase --abort &&
147 test $(git rev-parse new-branch1) = $(git rev-parse HEAD) &&
148 ! test -d .git/.dotest-merge
151 test_expect_success 'retain authorship' '
155 GIT_AUTHOR_NAME="Twerp Snog" git commit -m "different author" &&
157 git rebase -i --onto master HEAD^ &&
158 git show HEAD | grep "^Author: Twerp Snog"
161 test_expect_success 'squash' '
162 git reset --hard twerp &&
165 GIT_AUTHOR_NAME="Nitfol" git commit -m "nitfol" file7 &&
166 echo "******************************" &&
167 FAKE_LINES="1 squash 2" git rebase -i --onto master HEAD~2 &&
168 test B = $(cat file7) &&
169 test $(git rev-parse HEAD^) = $(git rev-parse master)
172 test_expect_success 'retain authorship when squashing' '
173 git show HEAD | grep "^Author: Nitfol"
176 test_expect_success 'preserve merges with -p' '
177 git checkout -b to-be-preserved master^ &&
178 : > unrelated-file &&
179 git add unrelated-file &&
181 git commit -m "unrelated" &&
182 git checkout -b to-be-rebased master &&
185 git commit -m J file1 &&
187 git merge to-be-preserved &&
190 git commit -m K file1 &&
192 git rebase -i -p --onto branch1 master &&
193 test $(git rev-parse HEAD^^2) = $(git rev-parse to-be-preserved) &&
194 test $(git rev-parse HEAD~3) = $(git rev-parse branch1) &&
195 test $(git show HEAD:file1) = C &&
196 test $(git show HEAD~2:file1) = B
199 test_expect_success '--continue tries to commit' '
201 ! git rebase -i --onto new-branch1 HEAD^ &&
202 echo resolved > file1 &&
204 FAKE_COMMIT_MESSAGE="chouette!" git rebase --continue &&
205 test $(git rev-parse HEAD^) = $(git rev-parse new-branch1) &&
206 git show HEAD | grep chouette
209 test_expect_success 'verbose flag is heeded, even after --continue' '
210 git reset --hard HEAD@{1} &&
212 ! git rebase -v -i --onto new-branch1 HEAD^ &&
213 echo resolved > file1 &&
215 git rebase --continue > output &&
216 grep "^ file1 | 2 +-$" output
219 test_expect_success 'multi-squash only fires up editor once' '
220 base=$(git rev-parse HEAD~4) &&
221 FAKE_COMMIT_AMEND="ONCE" FAKE_LINES="1 squash 2 squash 3 squash 4" \
222 git rebase -i $base &&
223 test $base = $(git rev-parse HEAD^) &&
224 test 1 = $(git show | grep ONCE | wc -l)
227 test_expect_success 'squash works as expected' '
228 for n in one two three four
234 one=$(git rev-parse HEAD~3) &&
235 FAKE_LINES="1 squash 3 2" git rebase -i HEAD~3 &&
236 test $one = $(git rev-parse HEAD~2)
239 test_expect_success 'interrupted squash works as expected' '
240 for n in one two three four
242 echo $n >> conflict &&
246 one=$(git rev-parse HEAD~3) &&
247 ! FAKE_LINES="1 squash 3 2" git rebase -i HEAD~3 &&
248 (echo one; echo two; echo four) > conflict &&
250 ! git rebase --continue &&
251 echo resolved > conflict &&
253 git rebase --continue &&
254 test $one = $(git rev-parse HEAD~2)
257 test_expect_success 'ignore patch if in upstream' '
258 HEAD=$(git rev-parse HEAD) &&
259 git checkout -b has-cherry-picked HEAD^ &&
260 echo unrelated > file7 &&
263 git commit -m "unrelated change" &&
264 git cherry-pick $HEAD &&
265 EXPECT_COUNT=1 git rebase -i $HEAD &&
266 test $HEAD = $(git rev-parse HEAD^)