Teach "am" and "rebase" to mark the original position with ORIG_HEAD
[git/platforms.git] / t / t7502-status.sh
blob38a48b57c70a888838cfa114be843e1d4aea00d8
1 #!/bin/sh
3 # Copyright (c) 2007 Johannes E. Schindelin
6 test_description='git-status'
8 . ./test-lib.sh
10 test_expect_success 'setup' '
11 : > tracked &&
12 : > modified &&
13 mkdir dir1 &&
14 : > dir1/tracked &&
15 : > dir1/modified &&
16 mkdir dir2 &&
17 : > dir1/tracked &&
18 : > dir1/modified &&
19 git add . &&
21 git status >output &&
23 test_tick &&
24 git commit -m initial &&
25 : > untracked &&
26 : > dir1/untracked &&
27 : > dir2/untracked &&
28 echo 1 > dir1/modified &&
29 echo 2 > dir2/modified &&
30 echo 3 > dir2/added &&
31 git add dir2/added
34 test_expect_success 'status (1)' '
36 grep "use \"git rm --cached <file>\.\.\.\" to unstage" output
40 cat > expect << \EOF
41 # On branch master
42 # Changes to be committed:
43 # (use "git reset HEAD <file>..." to unstage)
45 # new file: dir2/added
47 # Changed but not updated:
48 # (use "git add <file>..." to update what will be committed)
50 # modified: dir1/modified
52 # Untracked files:
53 # (use "git add <file>..." to include in what will be committed)
55 # dir1/untracked
56 # dir2/modified
57 # dir2/untracked
58 # expect
59 # output
60 # untracked
61 EOF
63 test_expect_success 'status (2)' '
65 git status > output &&
66 test_cmp expect output
70 cat >expect <<EOF
71 # On branch master
72 # Changes to be committed:
73 # (use "git reset HEAD <file>..." to unstage)
75 # new file: dir2/added
77 # Changed but not updated:
78 # (use "git add <file>..." to update what will be committed)
80 # modified: dir1/modified
82 # Untracked files not listed (use -u option to show untracked files)
83 EOF
84 test_expect_success 'status -uno' '
85 mkdir dir3 &&
86 : > dir3/untracked1 &&
87 : > dir3/untracked2 &&
88 git status -uno >output &&
89 test_cmp expect output
92 test_expect_success 'status (status.showUntrackedFiles no)' '
93 git config status.showuntrackedfiles no
94 git status >output &&
95 test_cmp expect output
98 cat >expect <<EOF
99 # On branch master
100 # Changes to be committed:
101 # (use "git reset HEAD <file>..." to unstage)
103 # new file: dir2/added
105 # Changed but not updated:
106 # (use "git add <file>..." to update what will be committed)
108 # modified: dir1/modified
110 # Untracked files:
111 # (use "git add <file>..." to include in what will be committed)
113 # dir1/untracked
114 # dir2/modified
115 # dir2/untracked
116 # dir3/
117 # expect
118 # output
119 # untracked
121 test_expect_success 'status -unormal' '
122 git status -unormal >output &&
123 test_cmp expect output
126 test_expect_success 'status (status.showUntrackedFiles normal)' '
127 git config status.showuntrackedfiles normal
128 git status >output &&
129 test_cmp expect output
132 cat >expect <<EOF
133 # On branch master
134 # Changes to be committed:
135 # (use "git reset HEAD <file>..." to unstage)
137 # new file: dir2/added
139 # Changed but not updated:
140 # (use "git add <file>..." to update what will be committed)
142 # modified: dir1/modified
144 # Untracked files:
145 # (use "git add <file>..." to include in what will be committed)
147 # dir1/untracked
148 # dir2/modified
149 # dir2/untracked
150 # dir3/untracked1
151 # dir3/untracked2
152 # expect
153 # output
154 # untracked
156 test_expect_success 'status -uall' '
157 git status -uall >output &&
158 test_cmp expect output
160 test_expect_success 'status (status.showUntrackedFiles all)' '
161 git config status.showuntrackedfiles all
162 git status >output &&
163 rm -rf dir3 &&
164 git config --unset status.showuntrackedfiles &&
165 test_cmp expect output
168 cat > expect << \EOF
169 # On branch master
170 # Changes to be committed:
171 # (use "git reset HEAD <file>..." to unstage)
173 # new file: ../dir2/added
175 # Changed but not updated:
176 # (use "git add <file>..." to update what will be committed)
178 # modified: modified
180 # Untracked files:
181 # (use "git add <file>..." to include in what will be committed)
183 # untracked
184 # ../dir2/modified
185 # ../dir2/untracked
186 # ../expect
187 # ../output
188 # ../untracked
191 test_expect_success 'status with relative paths' '
193 (cd dir1 && git status) > output &&
194 test_cmp expect output
198 cat > expect << \EOF
199 # On branch master
200 # Changes to be committed:
201 # (use "git reset HEAD <file>..." to unstage)
203 # new file: dir2/added
205 # Changed but not updated:
206 # (use "git add <file>..." to update what will be committed)
208 # modified: dir1/modified
210 # Untracked files:
211 # (use "git add <file>..." to include in what will be committed)
213 # dir1/untracked
214 # dir2/modified
215 # dir2/untracked
216 # expect
217 # output
218 # untracked
221 test_expect_success 'status without relative paths' '
223 git config status.relativePaths false
224 (cd dir1 && git status) > output &&
225 test_cmp expect output
229 cat <<EOF >expect
230 # On branch master
231 # Changes to be committed:
232 # (use "git reset HEAD <file>..." to unstage)
234 # modified: dir1/modified
236 # Untracked files:
237 # (use "git add <file>..." to include in what will be committed)
239 # dir1/untracked
240 # dir2/
241 # expect
242 # output
243 # untracked
245 test_expect_success 'status of partial commit excluding new file in index' '
246 git status dir1/modified >output &&
247 test_cmp expect output
250 test_expect_success 'setup status submodule summary' '
251 test_create_repo sm && (
252 cd sm &&
253 >foo &&
254 git add foo &&
255 git commit -m "Add foo"
256 ) &&
257 git add sm
260 cat >expect <<EOF
261 # On branch master
262 # Changes to be committed:
263 # (use "git reset HEAD <file>..." to unstage)
265 # new file: dir2/added
266 # new file: sm
268 # Changed but not updated:
269 # (use "git add <file>..." to update what will be committed)
271 # modified: dir1/modified
273 # Untracked files:
274 # (use "git add <file>..." to include in what will be committed)
276 # dir1/untracked
277 # dir2/modified
278 # dir2/untracked
279 # expect
280 # output
281 # untracked
283 test_expect_success 'status submodule summary is disabled by default' '
284 git status >output &&
285 test_cmp expect output
288 head=$(cd sm && git rev-parse --short=7 --verify HEAD)
290 cat >expect <<EOF
291 # On branch master
292 # Changes to be committed:
293 # (use "git reset HEAD <file>..." to unstage)
295 # new file: dir2/added
296 # new file: sm
298 # Changed but not updated:
299 # (use "git add <file>..." to update what will be committed)
301 # modified: dir1/modified
303 # Modified submodules:
305 # * sm 0000000...$head (1):
306 # > Add foo
308 # Untracked files:
309 # (use "git add <file>..." to include in what will be committed)
311 # dir1/untracked
312 # dir2/modified
313 # dir2/untracked
314 # expect
315 # output
316 # untracked
318 test_expect_success 'status submodule summary' '
319 git config status.submodulesummary 10 &&
320 git status >output &&
321 test_cmp expect output
325 cat >expect <<EOF
326 # On branch master
327 # Changed but not updated:
328 # (use "git add <file>..." to update what will be committed)
330 # modified: dir1/modified
332 # Untracked files:
333 # (use "git add <file>..." to include in what will be committed)
335 # dir1/untracked
336 # dir2/modified
337 # dir2/untracked
338 # expect
339 # output
340 # untracked
341 no changes added to commit (use "git add" and/or "git commit -a")
343 test_expect_success 'status submodule summary (clean submodule)' '
344 git commit -m "commit submodule" &&
345 git config status.submodulesummary 10 &&
346 test_must_fail git status >output &&
347 test_cmp expect output
350 cat >expect <<EOF
351 # On branch master
352 # Changes to be committed:
353 # (use "git reset HEAD^1 <file>..." to unstage)
355 # new file: dir2/added
356 # new file: sm
358 # Changed but not updated:
359 # (use "git add <file>..." to update what will be committed)
361 # modified: dir1/modified
363 # Modified submodules:
365 # * sm 0000000...$head (1):
366 # > Add foo
368 # Untracked files:
369 # (use "git add <file>..." to include in what will be committed)
371 # dir1/untracked
372 # dir2/modified
373 # dir2/untracked
374 # expect
375 # output
376 # untracked
378 test_expect_success 'status submodule summary (--amend)' '
379 git config status.submodulesummary 10 &&
380 git status --amend >output &&
381 test_cmp expect output
384 test_done