1#!/bin/sh
2#
3# Copyright (c) 2005 Amos Waterland
4#
5
6test_description='git rebase assorted tests
7
8This test runs git rebase and checks that the author information is not lost
9among other things.
10'
11. ./test-lib.sh
12
13GIT_AUTHOR_NAME=author@name
14GIT_AUTHOR_EMAIL=bogus@email@address
15export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL
16
17test_expect_success 'prepare repository with topic branches' '
18 git config core.logAllRefUpdates true &&
19 echo First >A &&
20 git update-index --add A &&
21 git commit -m "Add A." &&
22 git checkout -b force-3way &&
23 echo Dummy >Y &&
24 git update-index --add Y &&
25 git commit -m "Add Y." &&
26 git checkout -b filemove &&
27 git reset --soft master &&
28 mkdir D &&
29 git mv A D/A &&
30 git commit -m "Move A." &&
31 git checkout -b my-topic-branch master &&
32 echo Second >B &&
33 git update-index --add B &&
34 git commit -m "Add B." &&
35 git checkout -f master &&
36 echo Third >>A &&
37 git update-index A &&
38 git commit -m "Modify A." &&
39 git checkout -b side my-topic-branch &&
40 echo Side >>C &&
41 git add C &&
42 git commit -m "Add C" &&
43 git checkout -f my-topic-branch &&
44 git tag topic
45'
46
47test_expect_success 'rebase on dirty worktree' '
48 echo dirty >>A &&
49 test_must_fail git rebase master
50'
51
52test_expect_success 'rebase on dirty cache' '
53 git add A &&
54 test_must_fail git rebase master
55'
56
57test_expect_success 'rebase against master' '
58 git reset --hard HEAD &&
59 git rebase master
60'
61
62test_expect_success 'the rebase operation should not have destroyed author information' '
63 ! (git log | grep "Author:" | grep "<>")
64'
65
66test_expect_success 'the rebase operation should not have destroyed author information (2)' "
67 git log -1 |
68 grep 'Author: $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>'
69"
70
71test_expect_success 'HEAD was detached during rebase' '
72 test $(git rev-parse HEAD@{1}) != $(git rev-parse my-topic-branch@{1})
73'
74
75test_expect_success 'rebase from ambiguous branch name' '
76 git checkout -b topic side &&
77 git rebase master
78'
79
80test_expect_success 'rebase a single mode change' '
81 git checkout master &&
82 git branch -D topic &&
83 echo 1 >X &&
84 git add X &&
85 test_tick &&
86 git commit -m prepare &&
87 git checkout -b modechange HEAD^ &&
88 echo 1 >X &&
89 git add X &&
90 test_chmod +x A &&
91 test_tick &&
92 git commit -m modechange &&
93 GIT_TRACE=1 git rebase master
94'
95
96test_expect_success 'rebase is not broken by diff.renames' '
97 test_config diff.renames copies &&
98 git checkout filemove &&
99 GIT_TRACE=1 git rebase force-3way
100'
101
102test_expect_success 'setup: recover' '
103 test_might_fail git rebase --abort &&
104 git reset --hard &&
105 git checkout modechange
106'
107
108test_expect_success 'Show verbose error when HEAD could not be detached' '
109 >B &&
110 test_must_fail git rebase topic 2>output.err >output.out &&
111 grep "The following untracked working tree files would be overwritten by checkout:" output.err &&
112 grep B output.err
113'
114rm -f B
115
116test_expect_success 'fail when upstream arg is missing and not on branch' '
117 git checkout topic &&
118 test_must_fail git rebase
119'
120
121test_expect_success 'fail when upstream arg is missing and not configured' '
122 git checkout -b no-config topic &&
123 test_must_fail git rebase
124'
125
126test_expect_success 'default to @{upstream} when upstream arg is missing' '
127 git checkout -b default topic &&
128 git config branch.default.remote . &&
129 git config branch.default.merge refs/heads/master &&
130 git rebase &&
131 test "$(git rev-parse default~1)" = "$(git rev-parse master)"
132'
133
134test_expect_success 'rebase -q is quiet' '
135 git checkout -b quiet topic &&
136 git rebase -q master >output.out 2>&1 &&
137 test_must_be_empty output.out
138'
139
140test_expect_success 'Rebase a commit that sprinkles CRs in' '
141 (
142 echo "One"
143 echo "TwoQ"
144 echo "Three"
145 echo "FQur"
146 echo "Five"
147 ) | q_to_cr >CR &&
148 git add CR &&
149 test_tick &&
150 git commit -a -m "A file with a line with CR" &&
151 git tag file-with-cr &&
152 git checkout HEAD^0 &&
153 git rebase --onto HEAD^^ HEAD^ &&
154 git diff --exit-code file-with-cr:CR HEAD:CR
155'
156
157test_expect_success 'rebase can copy notes' '
158 git config notes.rewrite.rebase true &&
159 git config notes.rewriteRef "refs/notes/*" &&
160 test_commit n1 &&
161 test_commit n2 &&
162 test_commit n3 &&
163 git notes add -m"a note" n3 &&
164 git rebase --onto n1 n2 &&
165 test "a note" = "$(git notes show HEAD)"
166'
167
168test_expect_success 'rebase -m can copy notes' '
169 git reset --hard n3 &&
170 git rebase -m --onto n1 n2 &&
171 test "a note" = "$(git notes show HEAD)"
172'
173
174test_expect_success 'rebase commit with an ancient timestamp' '
175 git reset --hard &&
176
177 >old.one && git add old.one && test_tick &&
178 git commit --date="@12345 +0400" -m "Old one" &&
179 >old.two && git add old.two && test_tick &&
180 git commit --date="@23456 +0500" -m "Old two" &&
181 >old.three && git add old.three && test_tick &&
182 git commit --date="@34567 +0600" -m "Old three" &&
183
184 git cat-file commit HEAD^^ >actual &&
185 grep "author .* 12345 +0400$" actual &&
186 git cat-file commit HEAD^ >actual &&
187 grep "author .* 23456 +0500$" actual &&
188 git cat-file commit HEAD >actual &&
189 grep "author .* 34567 +0600$" actual &&
190
191 git rebase --onto HEAD^^ HEAD^ &&
192
193 git cat-file commit HEAD >actual &&
194 grep "author .* 34567 +0600$" actual
195'
196
197test_done