3 # Copyright (c) 2005 Amos Waterland
6 test_description
='git rebase assorted tests
8 This test runs git rebase and checks that the author information is not lost
13 GIT_AUTHOR_NAME
=author@name
14 GIT_AUTHOR_EMAIL
=bogus@email@address
15 export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL
17 test_expect_success
'prepare repository with topic branches' '
18 git config core.logAllRefUpdates true &&
20 git update-index --add A &&
21 git commit -m "Add A." &&
22 git checkout -b force-3way &&
24 git update-index --add Y &&
25 git commit -m "Add Y." &&
26 git checkout -b filemove &&
27 git reset --soft master &&
30 git commit -m "Move A." &&
31 git checkout -b my-topic-branch master &&
33 git update-index --add B &&
34 git commit -m "Add B." &&
35 git checkout -f master &&
38 git commit -m "Modify A." &&
39 git checkout -b side my-topic-branch &&
42 git commit -m "Add C" &&
43 git checkout -f my-topic-branch &&
47 test_expect_success
'rebase on dirty worktree' '
49 test_must_fail git rebase master
52 test_expect_success
'rebase on dirty cache' '
54 test_must_fail git rebase master
57 test_expect_success
'rebase against master' '
58 git reset --hard HEAD &&
62 test_expect_success
'rebase, with <onto> and <upstream> specified as :/quuxery' '
63 test_when_finished "git branch -D torebase" &&
64 git checkout -b torebase my-topic-branch^ &&
65 upstream=$(git rev-parse ":/Add B") &&
66 onto=$(git rev-parse ":/Add A") &&
67 git rebase --onto $onto $upstream &&
68 git reset --hard my-topic-branch^ &&
69 git rebase --onto ":/Add A" ":/Add B" &&
70 git checkout my-topic-branch
73 test_expect_success
'the rebase operation should not have destroyed author information' '
74 ! (git log | grep "Author:" | grep "<>")
77 test_expect_success
'the rebase operation should not have destroyed author information (2)' "
79 grep 'Author: $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>'
82 test_expect_success
'HEAD was detached during rebase' '
83 test $(git rev-parse HEAD@{1}) != $(git rev-parse my-topic-branch@{1})
86 test_expect_success
'rebase from ambiguous branch name' '
87 git checkout -b topic side &&
91 test_expect_success
'rebase off of the previous branch using "-"' '
92 git checkout master &&
94 git rebase master >expect.messages &&
95 git merge-base master HEAD >expect.forkpoint &&
97 git checkout master &&
99 git rebase - >actual.messages &&
100 git merge-base master HEAD >actual.forkpoint &&
102 test_cmp expect.forkpoint actual.forkpoint &&
103 test_i18ncmp expect.messages actual.messages
106 test_expect_success
'rebase a single mode change' '
107 git checkout master &&
108 git branch -D topic &&
112 git commit -m prepare &&
113 git checkout -b modechange HEAD^ &&
118 git commit -m modechange &&
119 GIT_TRACE=1 git rebase master
122 test_expect_success
'rebase is not broken by diff.renames' '
123 test_config diff.renames copies &&
124 git checkout filemove &&
125 GIT_TRACE=1 git rebase force-3way
128 test_expect_success
'setup: recover' '
129 test_might_fail git rebase --abort &&
131 git checkout modechange
134 test_expect_success
'Show verbose error when HEAD could not be detached' '
136 test_must_fail git rebase topic 2>output.err >output.out &&
137 grep "The following untracked working tree files would be overwritten by checkout:" output.err &&
142 test_expect_success
'fail when upstream arg is missing and not on branch' '
143 git checkout topic &&
144 test_must_fail git rebase
147 test_expect_success
'fail when upstream arg is missing and not configured' '
148 git checkout -b no-config topic &&
149 test_must_fail git rebase
152 test_expect_success
'default to common base in @{upstream}s reflog if no upstream arg' '
153 git checkout -b default-base master &&
154 git checkout -b default topic &&
155 git config branch.default.remote . &&
156 git config branch.default.merge refs/heads/default-base &&
158 git rev-parse --verify default-base >expect &&
159 git rev-parse default~1 >actual &&
160 test_cmp expect actual &&
161 git checkout default-base &&
162 git reset --hard HEAD^ &&
163 git checkout default &&
165 git rev-parse --verify default-base >expect &&
166 git rev-parse default~1 >actual &&
167 test_cmp expect actual
170 test_expect_success
'rebase -q is quiet' '
171 git checkout -b quiet topic &&
172 git rebase -q master >output.out 2>&1 &&
173 test_must_be_empty output.out
176 test_expect_success
'Rebase a commit that sprinkles CRs in' '
186 git commit -a -m "A file with a line with CR" &&
187 git tag file-with-cr &&
188 git checkout HEAD^0 &&
189 git rebase --onto HEAD^^ HEAD^ &&
190 git diff --exit-code file-with-cr:CR HEAD:CR
193 test_expect_success
'rebase can copy notes' '
194 git config notes.rewrite.rebase true &&
195 git config notes.rewriteRef "refs/notes/*" &&
199 git notes add -m"a note" n3 &&
200 git rebase --onto n1 n2 &&
201 test "a note" = "$(git notes show HEAD)"
204 test_expect_success
'rebase -m can copy notes' '
205 git reset --hard n3 &&
206 git rebase -m --onto n1 n2 &&
207 test "a note" = "$(git notes show HEAD)"
210 test_expect_success
'rebase commit with an ancient timestamp' '
213 >old.one && git add old.one && test_tick &&
214 git commit --date="@12345 +0400" -m "Old one" &&
215 >old.two && git add old.two && test_tick &&
216 git commit --date="@23456 +0500" -m "Old two" &&
217 >old.three && git add old.three && test_tick &&
218 git commit --date="@34567 +0600" -m "Old three" &&
220 git cat-file commit HEAD^^ >actual &&
221 grep "author .* 12345 +0400$" actual &&
222 git cat-file commit HEAD^ >actual &&
223 grep "author .* 23456 +0500$" actual &&
224 git cat-file commit HEAD >actual &&
225 grep "author .* 34567 +0600$" actual &&
227 git rebase --onto HEAD^^ HEAD^ &&
229 git cat-file commit HEAD >actual &&
230 grep "author .* 34567 +0600$" actual