tests: clean after SANITY tests
[git/git.git] / t / t7508-status.sh
CommitLineData
367c9886
JS
1#!/bin/sh
2#
3# Copyright (c) 2007 Johannes E. Schindelin
4#
5
47a528ad 6test_description='git status'
367c9886
JS
7
8. ./test-lib.sh
01c94e90 9. "$TEST_DIRECTORY"/lib-terminal.sh
367c9886 10
5d3dd915 11test_expect_success 'status -h in broken repository' '
6a38ef2c 12 git config --global advice.statusuoption false &&
5d3dd915
NTND
13 mkdir broken &&
14 test_when_finished "rm -fr broken" &&
15 (
16 cd broken &&
17 git init &&
18 echo "[status] showuntrackedfiles = CORRUPT" >>.git/config &&
19 test_expect_code 129 git status -h >usage 2>&1
20 ) &&
cc6658e7 21 test_i18ngrep "[Uu]sage" broken/usage
5d3dd915
NTND
22'
23
24test_expect_success 'commit -h in broken repository' '
25 mkdir broken &&
26 test_when_finished "rm -fr broken" &&
27 (
28 cd broken &&
29 git init &&
30 echo "[status] showuntrackedfiles = CORRUPT" >>.git/config &&
31 test_expect_code 129 git commit -h >usage 2>&1
32 ) &&
cc6658e7 33 test_i18ngrep "[Uu]sage" broken/usage
5d3dd915
NTND
34'
35
75177c85
JK
36test_expect_success 'create upstream branch' '
37 git checkout -b upstream &&
38 test_commit upstream1 &&
39 test_commit upstream2 &&
40 # leave the first commit on master as root because several
41 # tests depend on this case; for our upstream we only
42 # care about commit counts anyway, so a totally divergent
43 # history is OK
44 git checkout --orphan master
45'
46
367c9886 47test_expect_success 'setup' '
68cfc6f5
MG
48 : >tracked &&
49 : >modified &&
367c9886 50 mkdir dir1 &&
68cfc6f5
MG
51 : >dir1/tracked &&
52 : >dir1/modified &&
367c9886 53 mkdir dir2 &&
68cfc6f5
MG
54 : >dir1/tracked &&
55 : >dir1/modified &&
367c9886 56 git add . &&
ff58b9aa
JK
57
58 git status >output &&
59
367c9886
JS
60 test_tick &&
61 git commit -m initial &&
68cfc6f5
MG
62 : >untracked &&
63 : >dir1/untracked &&
64 : >dir2/untracked &&
65 echo 1 >dir1/modified &&
66 echo 2 >dir2/modified &&
67 echo 3 >dir2/added &&
75177c85
JK
68 git add dir2/added &&
69
70 git branch --set-upstream-to=upstream
367c9886
JS
71'
72
cc6658e7
JH
73test_expect_success 'status (1)' '
74 test_i18ngrep "use \"git rm --cached <file>\.\.\.\" to unstage" output
ff58b9aa
JK
75'
76
2556b996 77strip_comments () {
2e582df0
ES
78 tab=' '
79 sed "s/^\# //; s/^\#$//; s/^#$tab/$tab/" <"$1" >"$1".tmp &&
2556b996
MM
80 rm "$1" && mv "$1".tmp "$1"
81}
82
ec8a896e
JH
83cat >.gitignore <<\EOF
84.gitignore
85expect*
86output*
87EOF
88
323d0530 89test_expect_success 'status --column' '
323d0530
NTND
90 cat >expect <<\EOF &&
91# On branch master
75177c85
JK
92# Your branch and '\''upstream'\'' have diverged,
93# and have 1 and 2 different commits each, respectively.
94# (use "git pull" to merge the remote branch into yours)
95#
323d0530
NTND
96# Changes to be committed:
97# (use "git reset HEAD <file>..." to unstage)
98#
99# new file: dir2/added
100#
101# Changes not staged for commit:
102# (use "git add <file>..." to update what will be committed)
103# (use "git checkout -- <file>..." to discard changes in working directory)
104#
105# modified: dir1/modified
106#
107# Untracked files:
108# (use "git add <file>..." to include in what will be committed)
109#
ec8a896e
JH
110# dir1/untracked dir2/untracked
111# dir2/modified untracked
2f0f7f1c 112#
323d0530 113EOF
2556b996
MM
114 COLUMNS=50 git -c status.displayCommentPrefix=true status --column="column dense" >output &&
115 test_i18ncmp expect output
116'
117
118test_expect_success 'status --column status.displayCommentPrefix=false' '
119 strip_comments expect &&
120 COLUMNS=49 git -c status.displayCommentPrefix=false status --column="column dense" >output &&
b354f11b 121 test_i18ncmp expect output
323d0530
NTND
122'
123
68cfc6f5 124cat >expect <<\EOF
367c9886 125# On branch master
75177c85
JK
126# Your branch and 'upstream' have diverged,
127# and have 1 and 2 different commits each, respectively.
128# (use "git pull" to merge the remote branch into yours)
129#
367c9886
JS
130# Changes to be committed:
131# (use "git reset HEAD <file>..." to unstage)
132#
133# new file: dir2/added
134#
8009d83c 135# Changes not staged for commit:
367c9886 136# (use "git add <file>..." to update what will be committed)
4d6e4c4d 137# (use "git checkout -- <file>..." to discard changes in working directory)
367c9886
JS
138#
139# modified: dir1/modified
140#
141# Untracked files:
142# (use "git add <file>..." to include in what will be committed)
143#
144# dir1/untracked
145# dir2/modified
146# dir2/untracked
367c9886 147# untracked
2f0f7f1c 148#
367c9886
JS
149EOF
150
2556b996
MM
151test_expect_success 'status with status.displayCommentPrefix=true' '
152 git -c status.displayCommentPrefix=true status >output &&
153 test_i18ncmp expect output
154'
155
156test_expect_success 'status with status.displayCommentPrefix=false' '
157 strip_comments expect &&
158 git -c status.displayCommentPrefix=false status >output &&
cc6658e7 159 test_i18ncmp expect output
367c9886
JS
160'
161
f8c65c1f
MG
162test_expect_success 'status -v' '
163 (cat expect && git diff --cached) >expect-with-v &&
164 git status -v >output &&
165 test_i18ncmp expect-with-v output
166'
167
40555000
MG
168test_expect_success 'status -v -v' '
169 (cat expect &&
170 echo "Changes to be committed:" &&
171 git -c diff.mnemonicprefix=true diff --cached &&
172 echo "--------------------------------------------------" &&
173 echo "Changes not staged for commit:" &&
174 git -c diff.mnemonicprefix=true diff) >expect-with-v &&
175 git status -v -v >output &&
176 test_i18ncmp expect-with-v output
177'
178
2556b996
MM
179test_expect_success 'setup fake editor' '
180 cat >.git/editor <<-\EOF &&
181 #! /bin/sh
182 cp "$1" output
183EOF
184 chmod 755 .git/editor
185'
186
187commit_template_commented () {
188 (
189 EDITOR=.git/editor &&
190 export EDITOR &&
191 # Fails due to empty message
192 test_must_fail git commit
193 ) &&
194 ! grep '^[^#]' output
195}
196
197test_expect_success 'commit ignores status.displayCommentPrefix=false in COMMIT_EDITMSG' '
198 commit_template_commented
199'
200
18f3b5a9 201cat >expect <<\EOF
1c7969c9 202On branch master
75177c85
JK
203Your branch and 'upstream' have diverged,
204and have 1 and 2 different commits each, respectively.
205
1c7969c9
MM
206Changes to be committed:
207 new file: dir2/added
208
209Changes not staged for commit:
210 modified: dir1/modified
211
212Untracked files:
213 dir1/untracked
214 dir2/modified
215 dir2/untracked
1c7969c9 216 untracked
2f0f7f1c 217
18f3b5a9
MG
218EOF
219
cc6658e7 220test_expect_success 'status (advice.statusHints false)' '
c63659dd 221 test_config advice.statusHints false &&
18f3b5a9 222 git status >output &&
cc6658e7 223 test_i18ncmp expect output
18f3b5a9
MG
224
225'
226
68cfc6f5 227cat >expect <<\EOF
14ed05dd
MG
228 M dir1/modified
229A dir2/added
230?? dir1/untracked
231?? dir2/modified
232?? dir2/untracked
14ed05dd
MG
233?? untracked
234EOF
235
46077fa5 236test_expect_success 'status -s' '
14ed05dd 237
68cfc6f5 238 git status -s >output &&
14ed05dd
MG
239 test_cmp expect output
240
241'
242
150b493a
JH
243test_expect_success 'status with gitignore' '
244 {
245 echo ".gitignore" &&
f8c65c1f 246 echo "expect*" &&
150b493a
JH
247 echo "output" &&
248 echo "untracked"
249 } >.gitignore &&
250
251 cat >expect <<-\EOF &&
252 M dir1/modified
253 A dir2/added
254 ?? dir2/modified
255 EOF
256 git status -s >output &&
257 test_cmp expect output &&
258
259 cat >expect <<-\EOF &&
260 M dir1/modified
261 A dir2/added
262 ?? dir2/modified
263 !! .gitignore
264 !! dir1/untracked
265 !! dir2/untracked
266 !! expect
f8c65c1f 267 !! expect-with-v
150b493a
JH
268 !! output
269 !! untracked
270 EOF
271 git status -s --ignored >output &&
272 test_cmp expect output &&
273
1c7969c9
MM
274 cat >expect <<\EOF &&
275On branch master
75177c85
JK
276Your branch and '\''upstream'\'' have diverged,
277and have 1 and 2 different commits each, respectively.
278 (use "git pull" to merge the remote branch into yours)
279
1c7969c9
MM
280Changes to be committed:
281 (use "git reset HEAD <file>..." to unstage)
282
283 new file: dir2/added
284
285Changes not staged for commit:
286 (use "git add <file>..." to update what will be committed)
287 (use "git checkout -- <file>..." to discard changes in working directory)
288
289 modified: dir1/modified
290
291Untracked files:
292 (use "git add <file>..." to include in what will be committed)
293
294 dir2/modified
2f0f7f1c 295
1c7969c9
MM
296Ignored files:
297 (use "git add -f <file>..." to include in what will be committed)
298
299 .gitignore
300 dir1/untracked
301 dir2/untracked
302 expect
f8c65c1f 303 expect-with-v
1c7969c9
MM
304 output
305 untracked
2f0f7f1c 306
1c7969c9 307EOF
150b493a 308 git status --ignored >output &&
ca0f515d 309 test_i18ncmp expect output
150b493a
JH
310'
311
312test_expect_success 'status with gitignore (nothing untracked)' '
313 {
314 echo ".gitignore" &&
f8c65c1f 315 echo "expect*" &&
150b493a
JH
316 echo "dir2/modified" &&
317 echo "output" &&
318 echo "untracked"
319 } >.gitignore &&
320
321 cat >expect <<-\EOF &&
322 M dir1/modified
323 A dir2/added
324 EOF
325 git status -s >output &&
326 test_cmp expect output &&
327
328 cat >expect <<-\EOF &&
329 M dir1/modified
330 A dir2/added
331 !! .gitignore
332 !! dir1/untracked
333 !! dir2/modified
334 !! dir2/untracked
335 !! expect
f8c65c1f 336 !! expect-with-v
150b493a
JH
337 !! output
338 !! untracked
339 EOF
340 git status -s --ignored >output &&
341 test_cmp expect output &&
342
1c7969c9
MM
343 cat >expect <<\EOF &&
344On branch master
75177c85
JK
345Your branch and '\''upstream'\'' have diverged,
346and have 1 and 2 different commits each, respectively.
347 (use "git pull" to merge the remote branch into yours)
348
1c7969c9
MM
349Changes to be committed:
350 (use "git reset HEAD <file>..." to unstage)
351
352 new file: dir2/added
353
354Changes not staged for commit:
355 (use "git add <file>..." to update what will be committed)
356 (use "git checkout -- <file>..." to discard changes in working directory)
357
358 modified: dir1/modified
359
360Ignored files:
361 (use "git add -f <file>..." to include in what will be committed)
362
363 .gitignore
364 dir1/untracked
365 dir2/modified
366 dir2/untracked
367 expect
f8c65c1f 368 expect-with-v
1c7969c9
MM
369 output
370 untracked
2f0f7f1c 371
1c7969c9 372EOF
150b493a 373 git status --ignored >output &&
ca0f515d 374 test_i18ncmp expect output
150b493a
JH
375'
376
ec8a896e
JH
377cat >.gitignore <<\EOF
378.gitignore
379expect*
380output*
381EOF
150b493a 382
46077fa5 383cat >expect <<\EOF
75177c85 384## master...upstream [ahead 1, behind 2]
46077fa5
MG
385 M dir1/modified
386A dir2/added
387?? dir1/untracked
388?? dir2/modified
389?? dir2/untracked
46077fa5
MG
390?? untracked
391EOF
392
393test_expect_success 'status -s -b' '
394
395 git status -s -b >output &&
0d75bfe6 396 test_i18ncmp expect output
46077fa5
MG
397
398'
399
a5985237
JK
400test_expect_success 'status -s -z -b' '
401 tr "\\n" Q <expect >expect.q &&
402 mv expect.q expect &&
403 git status -s -z -b >output &&
404 nul_to_q <output >output.q &&
405 mv output.q output &&
0d75bfe6 406 test_i18ncmp expect output
a5985237
JK
407'
408
355ec7a1
ÆAB
409test_expect_success 'setup dir3' '
410 mkdir dir3 &&
411 : >dir3/untracked1 &&
412 : >dir3/untracked2
413'
414
cc6658e7 415test_expect_success 'status -uno' '
1c7969c9
MM
416 cat >expect <<EOF &&
417On branch master
75177c85
JK
418Your branch and '\''upstream'\'' have diverged,
419and have 1 and 2 different commits each, respectively.
420 (use "git pull" to merge the remote branch into yours)
421
1c7969c9
MM
422Changes to be committed:
423 (use "git reset HEAD <file>..." to unstage)
424
425 new file: dir2/added
426
427Changes not staged for commit:
428 (use "git add <file>..." to update what will be committed)
429 (use "git checkout -- <file>..." to discard changes in working directory)
430
431 modified: dir1/modified
432
433Untracked files not listed (use -u option to show untracked files)
434EOF
6c2ce048 435 git status -uno >output &&
cc6658e7 436 test_i18ncmp expect output
6c2ce048
MSO
437'
438
cc6658e7 439test_expect_success 'status (status.showUntrackedFiles no)' '
c63659dd 440 test_config status.showuntrackedfiles no &&
d6293d1f 441 git status >output &&
cc6658e7 442 test_i18ncmp expect output
d6293d1f
MSO
443'
444
cc6658e7 445test_expect_success 'status -uno (advice.statusHints false)' '
1c7969c9
MM
446 cat >expect <<EOF &&
447On branch master
75177c85
JK
448Your branch and '\''upstream'\'' have diverged,
449and have 1 and 2 different commits each, respectively.
450
1c7969c9
MM
451Changes to be committed:
452 new file: dir2/added
453
454Changes not staged for commit:
455 modified: dir1/modified
456
457Untracked files not listed
458EOF
c63659dd 459 test_config advice.statusHints false &&
18f3b5a9 460 git status -uno >output &&
cc6658e7 461 test_i18ncmp expect output
18f3b5a9 462'
18f3b5a9 463
14ed05dd
MG
464cat >expect << EOF
465 M dir1/modified
466A dir2/added
467EOF
468test_expect_success 'status -s -uno' '
14ed05dd
MG
469 git status -s -uno >output &&
470 test_cmp expect output
471'
472
473test_expect_success 'status -s (status.showUntrackedFiles no)' '
99094a7a 474 git config status.showuntrackedfiles no &&
14ed05dd
MG
475 git status -s >output &&
476 test_cmp expect output
477'
478
cc6658e7 479test_expect_success 'status -unormal' '
1c7969c9
MM
480 cat >expect <<EOF &&
481On branch master
75177c85
JK
482Your branch and '\''upstream'\'' have diverged,
483and have 1 and 2 different commits each, respectively.
484 (use "git pull" to merge the remote branch into yours)
485
1c7969c9
MM
486Changes to be committed:
487 (use "git reset HEAD <file>..." to unstage)
488
489 new file: dir2/added
490
491Changes not staged for commit:
492 (use "git add <file>..." to update what will be committed)
493 (use "git checkout -- <file>..." to discard changes in working directory)
494
495 modified: dir1/modified
496
497Untracked files:
498 (use "git add <file>..." to include in what will be committed)
499
500 dir1/untracked
501 dir2/modified
502 dir2/untracked
503 dir3/
1c7969c9 504 untracked
2f0f7f1c 505
1c7969c9 506EOF
4bfee30a 507 git status -unormal >output &&
cc6658e7 508 test_i18ncmp expect output
4bfee30a
MSO
509'
510
cc6658e7 511test_expect_success 'status (status.showUntrackedFiles normal)' '
99094a7a 512 test_config status.showuntrackedfiles normal &&
d6293d1f 513 git status >output &&
cc6658e7 514 test_i18ncmp expect output
d6293d1f
MSO
515'
516
14ed05dd
MG
517cat >expect <<EOF
518 M dir1/modified
519A dir2/added
520?? dir1/untracked
521?? dir2/modified
522?? dir2/untracked
523?? dir3/
14ed05dd
MG
524?? untracked
525EOF
526test_expect_success 'status -s -unormal' '
14ed05dd
MG
527 git status -s -unormal >output &&
528 test_cmp expect output
529'
530
531test_expect_success 'status -s (status.showUntrackedFiles normal)' '
99094a7a 532 git config status.showuntrackedfiles normal &&
14ed05dd
MG
533 git status -s >output &&
534 test_cmp expect output
535'
536
cc6658e7 537test_expect_success 'status -uall' '
1c7969c9
MM
538 cat >expect <<EOF &&
539On branch master
75177c85
JK
540Your branch and '\''upstream'\'' have diverged,
541and have 1 and 2 different commits each, respectively.
542 (use "git pull" to merge the remote branch into yours)
543
1c7969c9
MM
544Changes to be committed:
545 (use "git reset HEAD <file>..." to unstage)
546
547 new file: dir2/added
548
549Changes not staged for commit:
550 (use "git add <file>..." to update what will be committed)
551 (use "git checkout -- <file>..." to discard changes in working directory)
552
553 modified: dir1/modified
554
555Untracked files:
556 (use "git add <file>..." to include in what will be committed)
557
558 dir1/untracked
559 dir2/modified
560 dir2/untracked
561 dir3/untracked1
562 dir3/untracked2
1c7969c9 563 untracked
2f0f7f1c 564
1c7969c9 565EOF
4bfee30a 566 git status -uall >output &&
cc6658e7 567 test_i18ncmp expect output
d6293d1f 568'
cc6658e7
JH
569
570test_expect_success 'status (status.showUntrackedFiles all)' '
99094a7a 571 test_config status.showuntrackedfiles all &&
d6293d1f 572 git status >output &&
cc6658e7 573 test_i18ncmp expect output
4bfee30a
MSO
574'
575
355ec7a1
ÆAB
576test_expect_success 'teardown dir3' '
577 rm -rf dir3
578'
579
14ed05dd
MG
580cat >expect <<EOF
581 M dir1/modified
582A dir2/added
583?? dir1/untracked
584?? dir2/modified
585?? dir2/untracked
14ed05dd
MG
586?? untracked
587EOF
588test_expect_success 'status -s -uall' '
a6a4a88a 589 test_unconfig status.showuntrackedfiles &&
14ed05dd
MG
590 git status -s -uall >output &&
591 test_cmp expect output
592'
593test_expect_success 'status -s (status.showUntrackedFiles all)' '
c63659dd 594 test_config status.showuntrackedfiles all &&
14ed05dd
MG
595 git status -s >output &&
596 rm -rf dir3 &&
14ed05dd
MG
597 test_cmp expect output
598'
599
cc6658e7 600test_expect_success 'status with relative paths' '
1c7969c9
MM
601 cat >expect <<\EOF &&
602On branch master
75177c85
JK
603Your branch and '\''upstream'\'' have diverged,
604and have 1 and 2 different commits each, respectively.
605 (use "git pull" to merge the remote branch into yours)
606
1c7969c9
MM
607Changes to be committed:
608 (use "git reset HEAD <file>..." to unstage)
609
610 new file: ../dir2/added
611
612Changes not staged for commit:
613 (use "git add <file>..." to update what will be committed)
614 (use "git checkout -- <file>..." to discard changes in working directory)
615
616 modified: modified
617
618Untracked files:
619 (use "git add <file>..." to include in what will be committed)
620
621 untracked
622 ../dir2/modified
623 ../dir2/untracked
1c7969c9 624 ../untracked
2f0f7f1c 625
1c7969c9 626EOF
68cfc6f5 627 (cd dir1 && git status) >output &&
cc6658e7 628 test_i18ncmp expect output
367c9886
JS
629'
630
68cfc6f5 631cat >expect <<\EOF
14ed05dd
MG
632 M modified
633A ../dir2/added
634?? untracked
635?? ../dir2/modified
636?? ../dir2/untracked
14ed05dd
MG
637?? ../untracked
638EOF
639test_expect_success 'status -s with relative paths' '
640
68cfc6f5 641 (cd dir1 && git status -s) >output &&
14ed05dd
MG
642 test_cmp expect output
643
644'
645
68cfc6f5 646cat >expect <<\EOF
c521bb71
MG
647 M dir1/modified
648A dir2/added
649?? dir1/untracked
650?? dir2/modified
651?? dir2/untracked
c521bb71
MG
652?? untracked
653EOF
654
655test_expect_success 'status --porcelain ignores relative paths setting' '
656
68cfc6f5 657 (cd dir1 && git status --porcelain) >output &&
c521bb71
MG
658 test_cmp expect output
659
660'
661
68cfc6f5
MG
662test_expect_success 'setup unique colors' '
663
1d282327 664 git config status.color.untracked blue &&
93fdf301
SK
665 git config status.color.branch green &&
666 git config status.color.localBranch yellow &&
667 git config status.color.remoteBranch cyan
68cfc6f5
MG
668
669'
670
01c94e90 671test_expect_success TTY 'status with color.ui' '
1c7969c9
MM
672 cat >expect <<\EOF &&
673On branch <GREEN>master<RESET>
75177c85
JK
674Your branch and '\''upstream'\'' have diverged,
675and have 1 and 2 different commits each, respectively.
676 (use "git pull" to merge the remote branch into yours)
677
1c7969c9
MM
678Changes to be committed:
679 (use "git reset HEAD <file>..." to unstage)
680
681 <GREEN>new file: dir2/added<RESET>
682
683Changes not staged for commit:
684 (use "git add <file>..." to update what will be committed)
685 (use "git checkout -- <file>..." to discard changes in working directory)
686
687 <RED>modified: dir1/modified<RESET>
688
689Untracked files:
690 (use "git add <file>..." to include in what will be committed)
691
692 <BLUE>dir1/untracked<RESET>
693 <BLUE>dir2/modified<RESET>
694 <BLUE>dir2/untracked<RESET>
1c7969c9 695 <BLUE>untracked<RESET>
2f0f7f1c 696
1c7969c9 697EOF
01c94e90
JK
698 test_config color.ui auto &&
699 test_terminal git status | test_decode_color >output &&
cc6658e7 700 test_i18ncmp expect output
68cfc6f5
MG
701'
702
01c94e90
JK
703test_expect_success TTY 'status with color.status' '
704 test_config color.status auto &&
705 test_terminal git status | test_decode_color >output &&
cc6658e7 706 test_i18ncmp expect output
68cfc6f5
MG
707'
708
709cat >expect <<\EOF
710 <RED>M<RESET> dir1/modified
711<GREEN>A<RESET> dir2/added
712<BLUE>??<RESET> dir1/untracked
713<BLUE>??<RESET> dir2/modified
714<BLUE>??<RESET> dir2/untracked
68cfc6f5
MG
715<BLUE>??<RESET> untracked
716EOF
717
01c94e90 718test_expect_success TTY 'status -s with color.ui' '
68cfc6f5 719
01c94e90
JK
720 git config color.ui auto &&
721 test_terminal git status -s | test_decode_color >output &&
68cfc6f5
MG
722 test_cmp expect output
723
724'
725
01c94e90 726test_expect_success TTY 'status -s with color.status' '
68cfc6f5
MG
727
728 git config --unset color.ui &&
01c94e90
JK
729 git config color.status auto &&
730 test_terminal git status -s | test_decode_color >output &&
68cfc6f5
MG
731 test_cmp expect output
732
733'
734
46077fa5 735cat >expect <<\EOF
93fdf301 736## <YELLOW>master<RESET>...<CYAN>upstream<RESET> [ahead <YELLOW>1<RESET>, behind <CYAN>2<RESET>]
46077fa5
MG
737 <RED>M<RESET> dir1/modified
738<GREEN>A<RESET> dir2/added
739<BLUE>??<RESET> dir1/untracked
740<BLUE>??<RESET> dir2/modified
741<BLUE>??<RESET> dir2/untracked
46077fa5
MG
742<BLUE>??<RESET> untracked
743EOF
744
01c94e90 745test_expect_success TTY 'status -s -b with color.status' '
46077fa5 746
01c94e90 747 test_terminal git status -s -b | test_decode_color >output &&
0d75bfe6 748 test_i18ncmp expect output
46077fa5
MG
749
750'
751
68cfc6f5
MG
752cat >expect <<\EOF
753 M dir1/modified
754A dir2/added
755?? dir1/untracked
756?? dir2/modified
757?? dir2/untracked
68cfc6f5
MG
758?? untracked
759EOF
760
01c94e90 761test_expect_success TTY 'status --porcelain ignores color.ui' '
68cfc6f5
MG
762
763 git config --unset color.status &&
01c94e90
JK
764 git config color.ui auto &&
765 test_terminal git status --porcelain | test_decode_color >output &&
68cfc6f5
MG
766 test_cmp expect output
767
768'
769
01c94e90 770test_expect_success TTY 'status --porcelain ignores color.status' '
68cfc6f5
MG
771
772 git config --unset color.ui &&
01c94e90
JK
773 git config color.status auto &&
774 test_terminal git status --porcelain | test_decode_color >output &&
68cfc6f5
MG
775 test_cmp expect output
776
777'
778
779# recover unconditionally from color tests
780git config --unset color.status
781git config --unset color.ui
782
d4a6bf1f 783test_expect_success 'status --porcelain respects -b' '
46077fa5
MG
784
785 git status --porcelain -b >output &&
d4a6bf1f 786 {
75177c85 787 echo "## master...upstream [ahead 1, behind 2]" &&
d4a6bf1f
JK
788 cat expect
789 } >tmp &&
790 mv tmp expect &&
46077fa5
MG
791 test_cmp expect output
792
793'
794
46f721c8 795
68cfc6f5 796
cc6658e7 797test_expect_success 'status without relative paths' '
1c7969c9
MM
798 cat >expect <<\EOF &&
799On branch master
75177c85
JK
800Your branch and '\''upstream'\'' have diverged,
801and have 1 and 2 different commits each, respectively.
802 (use "git pull" to merge the remote branch into yours)
803
1c7969c9
MM
804Changes to be committed:
805 (use "git reset HEAD <file>..." to unstage)
806
807 new file: dir2/added
808
809Changes not staged for commit:
810 (use "git add <file>..." to update what will be committed)
811 (use "git checkout -- <file>..." to discard changes in working directory)
46f721c8 812
1c7969c9
MM
813 modified: dir1/modified
814
815Untracked files:
816 (use "git add <file>..." to include in what will be committed)
817
818 dir1/untracked
819 dir2/modified
820 dir2/untracked
1c7969c9 821 untracked
2f0f7f1c 822
1c7969c9 823EOF
c63659dd 824 test_config status.relativePaths false &&
68cfc6f5 825 (cd dir1 && git status) >output &&
cc6658e7 826 test_i18ncmp expect output
46f721c8
JK
827
828'
829
68cfc6f5 830cat >expect <<\EOF
14ed05dd
MG
831 M dir1/modified
832A dir2/added
833?? dir1/untracked
834?? dir2/modified
835?? dir2/untracked
14ed05dd
MG
836?? untracked
837EOF
838
839test_expect_success 'status -s without relative paths' '
840
c63659dd 841 test_config status.relativePaths false &&
68cfc6f5 842 (cd dir1 && git status -s) >output &&
14ed05dd
MG
843 test_cmp expect output
844
845'
846
9e4b7ab6 847test_expect_success 'dry-run of partial commit excluding new file in index' '
1c7969c9
MM
848 cat >expect <<EOF &&
849On branch master
75177c85
JK
850Your branch and '\''upstream'\'' have diverged,
851and have 1 and 2 different commits each, respectively.
852 (use "git pull" to merge the remote branch into yours)
853
1c7969c9
MM
854Changes to be committed:
855 (use "git reset HEAD <file>..." to unstage)
856
857 modified: dir1/modified
858
859Untracked files:
860 (use "git add <file>..." to include in what will be committed)
861
862 dir1/untracked
863 dir2/
1c7969c9 864 untracked
2f0f7f1c 865
1c7969c9 866EOF
cc6658e7
JH
867 git commit --dry-run dir1/modified >output &&
868 test_i18ncmp expect output
959ba670
JK
869'
870
4c926b37 871cat >expect <<EOF
378932d3 872:100644 100644 $EMPTY_BLOB 0000000000000000000000000000000000000000 M dir1/modified
4c926b37 873EOF
4bb6644d 874test_expect_success 'status refreshes the index' '
4c926b37
MH
875 touch dir2/added &&
876 git status &&
877 git diff-files >output &&
878 test_cmp expect output
879'
880
e5e4a7f2
PY
881test_expect_success 'setup status submodule summary' '
882 test_create_repo sm && (
883 cd sm &&
884 >foo &&
885 git add foo &&
886 git commit -m "Add foo"
887 ) &&
888 git add sm
889'
890
cc6658e7 891test_expect_success 'status submodule summary is disabled by default' '
1c7969c9
MM
892 cat >expect <<EOF &&
893On branch master
75177c85
JK
894Your branch and '\''upstream'\'' have diverged,
895and have 1 and 2 different commits each, respectively.
896 (use "git pull" to merge the remote branch into yours)
897
1c7969c9
MM
898Changes to be committed:
899 (use "git reset HEAD <file>..." to unstage)
900
901 new file: dir2/added
902 new file: sm
903
904Changes not staged for commit:
905 (use "git add <file>..." to update what will be committed)
906 (use "git checkout -- <file>..." to discard changes in working directory)
907
908 modified: dir1/modified
909
910Untracked files:
911 (use "git add <file>..." to include in what will be committed)
912
913 dir1/untracked
914 dir2/modified
915 dir2/untracked
1c7969c9 916 untracked
2f0f7f1c 917
1c7969c9 918EOF
e5e4a7f2 919 git status >output &&
cc6658e7 920 test_i18ncmp expect output
e5e4a7f2
PY
921'
922
98fa4738 923# we expect the same as the previous test
cc6658e7 924test_expect_success 'status --untracked-files=all does not show submodule' '
98fa4738 925 git status --untracked-files=all >output &&
cc6658e7 926 test_i18ncmp expect output
e5e4a7f2
PY
927'
928
14ed05dd
MG
929cat >expect <<EOF
930 M dir1/modified
931A dir2/added
932A sm
933?? dir1/untracked
934?? dir2/modified
935?? dir2/untracked
14ed05dd
MG
936?? untracked
937EOF
938test_expect_success 'status -s submodule summary is disabled by default' '
939 git status -s >output &&
940 test_cmp expect output
941'
942
943# we expect the same as the previous test
944test_expect_success 'status -s --untracked-files=all does not show submodule' '
945 git status -s --untracked-files=all >output &&
946 test_cmp expect output
947'
948
e5e4a7f2
PY
949head=$(cd sm && git rev-parse --short=7 --verify HEAD)
950
cc6658e7 951test_expect_success 'status submodule summary' '
1c7969c9
MM
952 cat >expect <<EOF &&
953On branch master
75177c85
JK
954Your branch and '\''upstream'\'' have diverged,
955and have 1 and 2 different commits each, respectively.
956 (use "git pull" to merge the remote branch into yours)
957
1c7969c9
MM
958Changes to be committed:
959 (use "git reset HEAD <file>..." to unstage)
960
961 new file: dir2/added
962 new file: sm
963
964Changes not staged for commit:
965 (use "git add <file>..." to update what will be committed)
966 (use "git checkout -- <file>..." to discard changes in working directory)
967
968 modified: dir1/modified
969
970Submodule changes to be committed:
971
972* sm 0000000...$head (1):
973 > Add foo
974
975Untracked files:
976 (use "git add <file>..." to include in what will be committed)
977
978 dir1/untracked
979 dir2/modified
980 dir2/untracked
1c7969c9 981 untracked
2f0f7f1c 982
1c7969c9 983EOF
e5e4a7f2
PY
984 git config status.submodulesummary 10 &&
985 git status >output &&
cc6658e7 986 test_i18ncmp expect output
e5e4a7f2
PY
987'
988
2556b996
MM
989test_expect_success 'status submodule summary with status.displayCommentPrefix=false' '
990 strip_comments expect &&
991 git -c status.displayCommentPrefix=false status >output &&
992 test_i18ncmp expect output
993'
994
995test_expect_success 'commit with submodule summary ignores status.displayCommentPrefix' '
996 commit_template_commented
997'
998
14ed05dd
MG
999cat >expect <<EOF
1000 M dir1/modified
1001A dir2/added
1002A sm
1003?? dir1/untracked
1004?? dir2/modified
1005?? dir2/untracked
14ed05dd
MG
1006?? untracked
1007EOF
1008test_expect_success 'status -s submodule summary' '
1009 git status -s >output &&
1010 test_cmp expect output
1011'
e5e4a7f2 1012
1c7969c9
MM
1013test_expect_success 'status submodule summary (clean submodule): commit' '
1014 cat >expect <<EOF &&
1015On branch master
75177c85
JK
1016Your branch and '\''upstream'\'' have diverged,
1017and have 2 and 2 different commits each, respectively.
1018 (use "git pull" to merge the remote branch into yours)
1019
1c7969c9
MM
1020Changes not staged for commit:
1021 (use "git add <file>..." to update what will be committed)
1022 (use "git checkout -- <file>..." to discard changes in working directory)
1023
1024 modified: dir1/modified
1025
1026Untracked files:
1027 (use "git add <file>..." to include in what will be committed)
1028
1029 dir1/untracked
1030 dir2/modified
1031 dir2/untracked
1c7969c9 1032 untracked
2f0f7f1c 1033
e5e4a7f2
PY
1034no changes added to commit (use "git add" and/or "git commit -a")
1035EOF
cc6658e7 1036 git commit -m "commit submodule" &&
e5e4a7f2 1037 git config status.submodulesummary 10 &&
9e4b7ab6 1038 test_must_fail git commit --dry-run >output &&
cc6658e7 1039 test_i18ncmp expect output &&
9e4b7ab6 1040 git status >output &&
cc6658e7 1041 test_i18ncmp expect output
e5e4a7f2
PY
1042'
1043
14ed05dd
MG
1044cat >expect <<EOF
1045 M dir1/modified
1046?? dir1/untracked
1047?? dir2/modified
1048?? dir2/untracked
14ed05dd
MG
1049?? untracked
1050EOF
1051test_expect_success 'status -s submodule summary (clean submodule)' '
1052 git status -s >output &&
1053 test_cmp expect output
1054'
1055
000f97bd 1056test_expect_success 'status -z implies porcelain' '
95b9f9f9 1057 git status --porcelain |
94221d22 1058 perl -pe "s/\012/\000/g" >expect &&
95b9f9f9
BC
1059 git status -z >output &&
1060 test_cmp expect output
1061'
1062
cc6658e7 1063test_expect_success 'commit --dry-run submodule summary (--amend)' '
1c7969c9
MM
1064 cat >expect <<EOF &&
1065On branch master
75177c85
JK
1066Your branch and '\''upstream'\'' have diverged,
1067and have 2 and 2 different commits each, respectively.
1068 (use "git pull" to merge the remote branch into yours)
1069
1c7969c9
MM
1070Changes to be committed:
1071 (use "git reset HEAD^1 <file>..." to unstage)
1072
1073 new file: dir2/added
1074 new file: sm
1075
1076Changes not staged for commit:
1077 (use "git add <file>..." to update what will be committed)
1078 (use "git checkout -- <file>..." to discard changes in working directory)
1079
1080 modified: dir1/modified
1081
1082Submodule changes to be committed:
1083
1084* sm 0000000...$head (1):
1085 > Add foo
1086
1087Untracked files:
1088 (use "git add <file>..." to include in what will be committed)
1089
1090 dir1/untracked
1091 dir2/modified
1092 dir2/untracked
1c7969c9 1093 untracked
2f0f7f1c 1094
1c7969c9 1095EOF
e5e4a7f2 1096 git config status.submodulesummary 10 &&
9e4b7ab6 1097 git commit --dry-run --amend >output &&
cc6658e7 1098 test_i18ncmp expect output
e5e4a7f2
PY
1099'
1100
c91cfd19 1101test_expect_success POSIXPERM,SANITY 'status succeeds in a read-only repository' '
03771425 1102 test_when_finished "chmod 775 .git" &&
b2f6fd95
MH
1103 (
1104 chmod a-w .git &&
1105 # make dir1/tracked stat-dirty
1106 >dir1/tracked1 && mv -f dir1/tracked1 dir1/tracked &&
1107 git status -s >output &&
1108 ! grep dir1/tracked output &&
1109 # make sure "status" succeeded without writing index out
1110 git diff-files | grep dir1/tracked
1111 )
b2f6fd95
MH
1112'
1113
c2e0940b 1114(cd sm && echo > bar && git add bar && git commit -q -m 'Add bar') && git add sm
aee9c7d6
JL
1115new_head=$(cd sm && git rev-parse --short=7 --verify HEAD)
1116touch .gitmodules
1117
cc6658e7 1118test_expect_success '--ignore-submodules=untracked suppresses submodules with untracked content' '
1c7969c9
MM
1119 cat > expect << EOF &&
1120On branch master
75177c85
JK
1121Your branch and '\''upstream'\'' have diverged,
1122and have 2 and 2 different commits each, respectively.
1123 (use "git pull" to merge the remote branch into yours)
1124
1c7969c9
MM
1125Changes to be committed:
1126 (use "git reset HEAD <file>..." to unstage)
1127
1128 modified: sm
1129
1130Changes not staged for commit:
1131 (use "git add <file>..." to update what will be committed)
1132 (use "git checkout -- <file>..." to discard changes in working directory)
1133
1134 modified: dir1/modified
1135
1136Submodule changes to be committed:
1137
1138* sm $head...$new_head (1):
1139 > Add bar
1140
1141Untracked files:
1142 (use "git add <file>..." to include in what will be committed)
1143
1144 .gitmodules
1145 dir1/untracked
1146 dir2/modified
1147 dir2/untracked
1c7969c9 1148 untracked
2f0f7f1c 1149
1c7969c9 1150EOF
cc6658e7
JH
1151 echo modified sm/untracked &&
1152 git status --ignore-submodules=untracked >output &&
1153 test_i18ncmp expect output
46a958b3
JL
1154'
1155
cc6658e7 1156test_expect_success '.gitmodules ignore=untracked suppresses submodules with untracked content' '
c63659dd 1157 test_config diff.ignoreSubmodules dirty &&
90e14525 1158 git status >output &&
cc6658e7 1159 test_i18ncmp expect output &&
302ad7a9
JL
1160 git config --add -f .gitmodules submodule.subname.ignore untracked &&
1161 git config --add -f .gitmodules submodule.subname.path sm &&
cc6658e7
JH
1162 git status >output &&
1163 test_i18ncmp expect output &&
c63659dd 1164 git config -f .gitmodules --remove-section submodule.subname
302ad7a9
JL
1165'
1166
cc6658e7 1167test_expect_success '.git/config ignore=untracked suppresses submodules with untracked content' '
302ad7a9
JL
1168 git config --add -f .gitmodules submodule.subname.ignore none &&
1169 git config --add -f .gitmodules submodule.subname.path sm &&
aee9c7d6
JL
1170 git config --add submodule.subname.ignore untracked &&
1171 git config --add submodule.subname.path sm &&
cc6658e7
JH
1172 git status >output &&
1173 test_i18ncmp expect output &&
302ad7a9
JL
1174 git config --remove-section submodule.subname &&
1175 git config --remove-section -f .gitmodules submodule.subname
aee9c7d6
JL
1176'
1177
cc6658e7
JH
1178test_expect_success '--ignore-submodules=dirty suppresses submodules with untracked content' '
1179 git status --ignore-submodules=dirty >output &&
1180 test_i18ncmp expect output
46a958b3
JL
1181'
1182
cc6658e7 1183test_expect_success '.gitmodules ignore=dirty suppresses submodules with untracked content' '
c63659dd 1184 test_config diff.ignoreSubmodules dirty &&
90e14525
JL
1185 git status >output &&
1186 ! test -s actual &&
302ad7a9
JL
1187 git config --add -f .gitmodules submodule.subname.ignore dirty &&
1188 git config --add -f .gitmodules submodule.subname.path sm &&
cc6658e7
JH
1189 git status >output &&
1190 test_i18ncmp expect output &&
c63659dd 1191 git config -f .gitmodules --remove-section submodule.subname
302ad7a9
JL
1192'
1193
cc6658e7 1194test_expect_success '.git/config ignore=dirty suppresses submodules with untracked content' '
302ad7a9
JL
1195 git config --add -f .gitmodules submodule.subname.ignore none &&
1196 git config --add -f .gitmodules submodule.subname.path sm &&
aee9c7d6
JL
1197 git config --add submodule.subname.ignore dirty &&
1198 git config --add submodule.subname.path sm &&
cc6658e7
JH
1199 git status >output &&
1200 test_i18ncmp expect output &&
302ad7a9
JL
1201 git config --remove-section submodule.subname &&
1202 git config -f .gitmodules --remove-section submodule.subname
aee9c7d6
JL
1203'
1204
cc6658e7
JH
1205test_expect_success '--ignore-submodules=dirty suppresses submodules with modified content' '
1206 echo modified >sm/foo &&
1207 git status --ignore-submodules=dirty >output &&
1208 test_i18ncmp expect output
46a958b3
JL
1209'
1210
cc6658e7 1211test_expect_success '.gitmodules ignore=dirty suppresses submodules with modified content' '
302ad7a9
JL
1212 git config --add -f .gitmodules submodule.subname.ignore dirty &&
1213 git config --add -f .gitmodules submodule.subname.path sm &&
cc6658e7
JH
1214 git status >output &&
1215 test_i18ncmp expect output &&
302ad7a9
JL
1216 git config -f .gitmodules --remove-section submodule.subname
1217'
1218
cc6658e7 1219test_expect_success '.git/config ignore=dirty suppresses submodules with modified content' '
302ad7a9
JL
1220 git config --add -f .gitmodules submodule.subname.ignore none &&
1221 git config --add -f .gitmodules submodule.subname.path sm &&
aee9c7d6
JL
1222 git config --add submodule.subname.ignore dirty &&
1223 git config --add submodule.subname.path sm &&
cc6658e7
JH
1224 git status >output &&
1225 test_i18ncmp expect output &&
302ad7a9
JL
1226 git config --remove-section submodule.subname &&
1227 git config -f .gitmodules --remove-section submodule.subname
aee9c7d6
JL
1228'
1229
cc6658e7 1230test_expect_success "--ignore-submodules=untracked doesn't suppress submodules with modified content" '
1c7969c9
MM
1231 cat > expect << EOF &&
1232On branch master
75177c85
JK
1233Your branch and '\''upstream'\'' have diverged,
1234and have 2 and 2 different commits each, respectively.
1235 (use "git pull" to merge the remote branch into yours)
1236
1c7969c9
MM
1237Changes to be committed:
1238 (use "git reset HEAD <file>..." to unstage)
1239
1240 modified: sm
1241
1242Changes not staged for commit:
1243 (use "git add <file>..." to update what will be committed)
1244 (use "git checkout -- <file>..." to discard changes in working directory)
1245 (commit or discard the untracked or modified content in submodules)
1246
1247 modified: dir1/modified
1248 modified: sm (modified content)
1249
1250Submodule changes to be committed:
1251
1252* sm $head...$new_head (1):
1253 > Add bar
1254
1255Untracked files:
1256 (use "git add <file>..." to include in what will be committed)
1257
1258 .gitmodules
1259 dir1/untracked
1260 dir2/modified
1261 dir2/untracked
1c7969c9 1262 untracked
2f0f7f1c 1263
1c7969c9 1264EOF
46a958b3 1265 git status --ignore-submodules=untracked > output &&
cc6658e7 1266 test_i18ncmp expect output
46a958b3
JL
1267'
1268
cc6658e7 1269test_expect_success ".gitmodules ignore=untracked doesn't suppress submodules with modified content" '
302ad7a9
JL
1270 git config --add -f .gitmodules submodule.subname.ignore untracked &&
1271 git config --add -f .gitmodules submodule.subname.path sm &&
cc6658e7
JH
1272 git status >output &&
1273 test_i18ncmp expect output &&
302ad7a9
JL
1274 git config -f .gitmodules --remove-section submodule.subname
1275'
1276
cc6658e7 1277test_expect_success ".git/config ignore=untracked doesn't suppress submodules with modified content" '
302ad7a9
JL
1278 git config --add -f .gitmodules submodule.subname.ignore none &&
1279 git config --add -f .gitmodules submodule.subname.path sm &&
aee9c7d6
JL
1280 git config --add submodule.subname.ignore untracked &&
1281 git config --add submodule.subname.path sm &&
cc6658e7
JH
1282 git status >output &&
1283 test_i18ncmp expect output &&
302ad7a9
JL
1284 git config --remove-section submodule.subname &&
1285 git config -f .gitmodules --remove-section submodule.subname
aee9c7d6
JL
1286'
1287
46a958b3
JL
1288head2=$(cd sm && git commit -q -m "2nd commit" foo && git rev-parse --short=7 --verify HEAD)
1289
cc6658e7 1290test_expect_success "--ignore-submodules=untracked doesn't suppress submodule summary" '
1c7969c9
MM
1291 cat > expect << EOF &&
1292On branch master
75177c85
JK
1293Your branch and '\''upstream'\'' have diverged,
1294and have 2 and 2 different commits each, respectively.
1295 (use "git pull" to merge the remote branch into yours)
1296
1c7969c9
MM
1297Changes to be committed:
1298 (use "git reset HEAD <file>..." to unstage)
1299
1300 modified: sm
1301
1302Changes not staged for commit:
1303 (use "git add <file>..." to update what will be committed)
1304 (use "git checkout -- <file>..." to discard changes in working directory)
1305
1306 modified: dir1/modified
1307 modified: sm (new commits)
1308
1309Submodule changes to be committed:
1310
1311* sm $head...$new_head (1):
1312 > Add bar
1313
1314Submodules changed but not updated:
1315
1316* sm $new_head...$head2 (1):
1317 > 2nd commit
1318
1319Untracked files:
1320 (use "git add <file>..." to include in what will be committed)
1321
1322 .gitmodules
1323 dir1/untracked
1324 dir2/modified
1325 dir2/untracked
1c7969c9 1326 untracked
2f0f7f1c 1327
1c7969c9 1328EOF
46a958b3 1329 git status --ignore-submodules=untracked > output &&
cc6658e7 1330 test_i18ncmp expect output
46a958b3
JL
1331'
1332
cc6658e7 1333test_expect_success ".gitmodules ignore=untracked doesn't suppress submodule summary" '
302ad7a9
JL
1334 git config --add -f .gitmodules submodule.subname.ignore untracked &&
1335 git config --add -f .gitmodules submodule.subname.path sm &&
cc6658e7
JH
1336 git status >output &&
1337 test_i18ncmp expect output &&
302ad7a9
JL
1338 git config -f .gitmodules --remove-section submodule.subname
1339'
1340
cc6658e7 1341test_expect_success ".git/config ignore=untracked doesn't suppress submodule summary" '
302ad7a9
JL
1342 git config --add -f .gitmodules submodule.subname.ignore none &&
1343 git config --add -f .gitmodules submodule.subname.path sm &&
aee9c7d6
JL
1344 git config --add submodule.subname.ignore untracked &&
1345 git config --add submodule.subname.path sm &&
cc6658e7
JH
1346 git status >output &&
1347 test_i18ncmp expect output &&
302ad7a9
JL
1348 git config --remove-section submodule.subname &&
1349 git config -f .gitmodules --remove-section submodule.subname
aee9c7d6
JL
1350'
1351
cc6658e7 1352test_expect_success "--ignore-submodules=dirty doesn't suppress submodule summary" '
46a958b3 1353 git status --ignore-submodules=dirty > output &&
cc6658e7 1354 test_i18ncmp expect output
46a958b3 1355'
cc6658e7 1356test_expect_success ".gitmodules ignore=dirty doesn't suppress submodule summary" '
302ad7a9
JL
1357 git config --add -f .gitmodules submodule.subname.ignore dirty &&
1358 git config --add -f .gitmodules submodule.subname.path sm &&
cc6658e7
JH
1359 git status >output &&
1360 test_i18ncmp expect output &&
302ad7a9
JL
1361 git config -f .gitmodules --remove-section submodule.subname
1362'
46a958b3 1363
cc6658e7 1364test_expect_success ".git/config ignore=dirty doesn't suppress submodule summary" '
302ad7a9
JL
1365 git config --add -f .gitmodules submodule.subname.ignore none &&
1366 git config --add -f .gitmodules submodule.subname.path sm &&
aee9c7d6
JL
1367 git config --add submodule.subname.ignore dirty &&
1368 git config --add submodule.subname.path sm &&
cc6658e7
JH
1369 git status >output &&
1370 test_i18ncmp expect output &&
302ad7a9
JL
1371 git config --remove-section submodule.subname &&
1372 git config -f .gitmodules --remove-section submodule.subname
aee9c7d6
JL
1373'
1374
eff80a9f
JH
1375cat > expect << EOF
1376; On branch master
75177c85
JK
1377; Your branch and 'upstream' have diverged,
1378; and have 2 and 2 different commits each, respectively.
1379; (use "git pull" to merge the remote branch into yours)
1380;
eff80a9f
JH
1381; Changes to be committed:
1382; (use "git reset HEAD <file>..." to unstage)
1383;
1384; modified: sm
1385;
1386; Changes not staged for commit:
1387; (use "git add <file>..." to update what will be committed)
1388; (use "git checkout -- <file>..." to discard changes in working directory)
1389;
1390; modified: dir1/modified
1391; modified: sm (new commits)
1392;
1393; Submodule changes to be committed:
1394;
1395; * sm $head...$new_head (1):
1396; > Add bar
1397;
1398; Submodules changed but not updated:
1399;
1400; * sm $new_head...$head2 (1):
1401; > 2nd commit
1402;
1403; Untracked files:
1404; (use "git add <file>..." to include in what will be committed)
1405;
1406; .gitmodules
1407; dir1/untracked
1408; dir2/modified
1409; dir2/untracked
eff80a9f 1410; untracked
2f0f7f1c 1411;
eff80a9f
JH
1412EOF
1413
1414test_expect_success "status (core.commentchar with submodule summary)" '
c63659dd 1415 test_config core.commentchar ";" &&
1c7969c9 1416 git -c status.displayCommentPrefix=true status >output &&
eff80a9f
JH
1417 test_i18ncmp expect output
1418'
1419
1420test_expect_success "status (core.commentchar with two chars with submodule summary)" '
c63659dd 1421 test_config core.commentchar ";;" &&
50b54fd7 1422 test_must_fail git -c status.displayCommentPrefix=true status
eff80a9f
JH
1423'
1424
1c7969c9
MM
1425test_expect_success "--ignore-submodules=all suppresses submodule summary" '
1426 cat > expect << EOF &&
1427On branch master
75177c85
JK
1428Your branch and '\''upstream'\'' have diverged,
1429and have 2 and 2 different commits each, respectively.
1430 (use "git pull" to merge the remote branch into yours)
1431
1c7969c9
MM
1432Changes not staged for commit:
1433 (use "git add <file>..." to update what will be committed)
1434 (use "git checkout -- <file>..." to discard changes in working directory)
1435
1436 modified: dir1/modified
1437
1438Untracked files:
1439 (use "git add <file>..." to include in what will be committed)
1440
1441 .gitmodules
1442 dir1/untracked
1443 dir2/modified
1444 dir2/untracked
1c7969c9 1445 untracked
2f0f7f1c 1446
46a958b3
JL
1447no changes added to commit (use "git add" and/or "git commit -a")
1448EOF
46a958b3 1449 git status --ignore-submodules=all > output &&
cc6658e7 1450 test_i18ncmp expect output
46a958b3
JL
1451'
1452
1d2f393a
JL
1453test_expect_success '.gitmodules ignore=all suppresses unstaged submodule summary' '
1454 cat > expect << EOF &&
1455On branch master
75177c85
JK
1456Your branch and '\''upstream'\'' have diverged,
1457and have 2 and 2 different commits each, respectively.
1458 (use "git pull" to merge the remote branch into yours)
1459
1d2f393a
JL
1460Changes to be committed:
1461 (use "git reset HEAD <file>..." to unstage)
1462
1463 modified: sm
1464
1465Changes not staged for commit:
1466 (use "git add <file>..." to update what will be committed)
1467 (use "git checkout -- <file>..." to discard changes in working directory)
1468
1469 modified: dir1/modified
1470
1471Untracked files:
1472 (use "git add <file>..." to include in what will be committed)
1473
1474 .gitmodules
1475 dir1/untracked
1476 dir2/modified
1477 dir2/untracked
1d2f393a
JL
1478 untracked
1479
1480EOF
302ad7a9
JL
1481 git config --add -f .gitmodules submodule.subname.ignore all &&
1482 git config --add -f .gitmodules submodule.subname.path sm &&
1483 git status > output &&
1edbaac3 1484 test_i18ncmp expect output &&
302ad7a9
JL
1485 git config -f .gitmodules --remove-section submodule.subname
1486'
1487
1d2f393a 1488test_expect_success '.git/config ignore=all suppresses unstaged submodule summary' '
302ad7a9
JL
1489 git config --add -f .gitmodules submodule.subname.ignore none &&
1490 git config --add -f .gitmodules submodule.subname.path sm &&
aee9c7d6
JL
1491 git config --add submodule.subname.ignore all &&
1492 git config --add submodule.subname.path sm &&
1493 git status > output &&
1edbaac3 1494 test_i18ncmp expect output &&
302ad7a9
JL
1495 git config --remove-section submodule.subname &&
1496 git config -f .gitmodules --remove-section submodule.subname
aee9c7d6
JL
1497'
1498
4fb5166a
JJGG
1499test_expect_success 'setup of test environment' '
1500 git config status.showUntrackedFiles no &&
1501 git status -s >expected_short &&
1502 git status --no-short >expected_noshort
1503'
1504
1505test_expect_success '"status.short=true" same as "-s"' '
1506 git -c status.short=true status >actual &&
1507 test_cmp expected_short actual
1508'
1509
1510test_expect_success '"status.short=true" weaker than "--no-short"' '
1511 git -c status.short=true status --no-short >actual &&
1512 test_cmp expected_noshort actual
1513'
1514
1515test_expect_success '"status.short=false" same as "--no-short"' '
1516 git -c status.short=false status >actual &&
1517 test_cmp expected_noshort actual
1518'
1519
1520test_expect_success '"status.short=false" weaker than "-s"' '
1521 git -c status.short=false status -s >actual &&
1522 test_cmp expected_short actual
1523'
1524
ec85d070
JJGG
1525test_expect_success '"status.branch=true" same as "-b"' '
1526 git status -sb >expected_branch &&
1527 git -c status.branch=true status -s >actual &&
1528 test_cmp expected_branch actual
1529'
1530
1531test_expect_success '"status.branch=true" different from "--no-branch"' '
1532 git status -s --no-branch >expected_nobranch &&
1533 git -c status.branch=true status -s >actual &&
1534 test_must_fail test_cmp expected_nobranch actual
1535'
1536
1537test_expect_success '"status.branch=true" weaker than "--no-branch"' '
1538 git -c status.branch=true status -s --no-branch >actual &&
1539 test_cmp expected_nobranch actual
1540'
1541
84b4202d
JH
1542test_expect_success '"status.branch=true" weaker than "--porcelain"' '
1543 git -c status.branch=true status --porcelain >actual &&
1544 test_cmp expected_nobranch actual
1545'
1546
ec85d070
JJGG
1547test_expect_success '"status.branch=false" same as "--no-branch"' '
1548 git -c status.branch=false status -s >actual &&
1549 test_cmp expected_nobranch actual
1550'
1551
1552test_expect_success '"status.branch=false" weaker than "-b"' '
1553 git -c status.branch=false status -sb >actual &&
1554 test_cmp expected_branch actual
1555'
1556
4fb5166a
JJGG
1557test_expect_success 'Restore default test environment' '
1558 git config --unset status.showUntrackedFiles
1559'
1560
1d2f393a
JL
1561test_expect_success 'git commit will commit a staged but ignored submodule' '
1562 git config --add -f .gitmodules submodule.subname.ignore all &&
1563 git config --add -f .gitmodules submodule.subname.path sm &&
1564 git config --add submodule.subname.ignore all &&
1565 git status -s --ignore-submodules=dirty >output &&
1566 test_i18ngrep "^M. sm" output &&
1567 GIT_EDITOR="echo hello >>\"\$1\"" &&
1568 export GIT_EDITOR &&
1569 git commit -uno &&
1570 git status -s --ignore-submodules=dirty >output &&
1571 test_i18ngrep ! "^M. sm" output
1572'
1573
1574test_expect_success 'git commit --dry-run will show a staged but ignored submodule' '
1575 git reset HEAD^ &&
1576 git add sm &&
1577 cat >expect << EOF &&
1578On branch master
75177c85
JK
1579Your branch and '\''upstream'\'' have diverged,
1580and have 2 and 2 different commits each, respectively.
1581 (use "git pull" to merge the remote branch into yours)
1582
1d2f393a
JL
1583Changes to be committed:
1584 (use "git reset HEAD <file>..." to unstage)
1585
1586 modified: sm
1587
1588Changes not staged for commit:
1589 (use "git add <file>..." to update what will be committed)
1590 (use "git checkout -- <file>..." to discard changes in working directory)
1591
1592 modified: dir1/modified
1593
1594Untracked files not listed (use -u option to show untracked files)
1595EOF
1596 git commit -uno --dry-run >output &&
1597 test_i18ncmp expect output &&
1598 git status -s --ignore-submodules=dirty >output &&
1599 test_i18ngrep "^M. sm" output
1600'
1601
c215d3d2 1602test_expect_success 'git commit -m will commit a staged but ignored submodule' '
1d2f393a
JL
1603 git commit -uno -m message &&
1604 git status -s --ignore-submodules=dirty >output &&
4fced247 1605 test_i18ngrep ! "^M. sm" output &&
1d2f393a
JL
1606 git config --remove-section submodule.subname &&
1607 git config -f .gitmodules --remove-section submodule.subname
1608'
1609
c1b5d019
LB
1610test_expect_success 'show stash info with "--show-stash"' '
1611 git reset --hard &&
1612 git stash clear &&
1613 echo 1 >file &&
1614 git add file &&
1615 git stash &&
1616 git status >expected_default &&
1617 git status --show-stash >expected_with_stash &&
1618 test_i18ngrep "^Your stash currently has 1 entry$" expected_with_stash
1619'
1620
1621test_expect_success 'no stash info with "--show-stash --no-show-stash"' '
1622 git status --show-stash --no-show-stash >expected_without_stash &&
1623 test_cmp expected_default expected_without_stash
1624'
1625
1626test_expect_success '"status.showStash=false" weaker than "--show-stash"' '
1627 git -c status.showStash=false status --show-stash >actual &&
1628 test_cmp expected_with_stash actual
1629'
1630
1631test_expect_success '"status.showStash=true" weaker than "--no-show-stash"' '
1632 git -c status.showStash=true status --no-show-stash >actual &&
1633 test_cmp expected_without_stash actual
1634'
1635
1636test_expect_success 'no additionnal info if no stash entries' '
1637 git stash clear &&
1638 git -c status.showStash=true status >actual &&
1639 test_cmp expected_without_stash actual
1640'
1641
4ddb1354
KS
1642test_expect_success '"No commits yet" should be noted in status output' '
1643 git checkout --orphan empty-branch-1 &&
1644 git status >output &&
1645 test_i18ngrep "No commits yet" output
1646'
1647
1648test_expect_success '"No commits yet" should not be noted in status output' '
1649 git checkout --orphan empty-branch-2 &&
1650 test_commit test-commit-1 &&
1651 git status >output &&
1652 test_i18ngrep ! "No commits yet" output
1653'
1654
1655test_expect_success '"Initial commit" should be noted in commit template' '
1656 git checkout --orphan empty-branch-3 &&
1657 touch to_be_committed_1 &&
1658 git add to_be_committed_1 &&
1659 git commit --dry-run >output &&
1660 test_i18ngrep "Initial commit" output
1661'
1662
1663test_expect_success '"Initial commit" should not be noted in commit template' '
1664 git checkout --orphan empty-branch-4 &&
1665 test_commit test-commit-2 &&
1666 touch to_be_committed_2 &&
1667 git add to_be_committed_2 &&
1668 git commit --dry-run >output &&
1669 test_i18ngrep ! "Initial commit" output
1670'
1671
27344d6a
JK
1672test_expect_success '--no-optional-locks prevents index update' '
1673 test-chmtime =1234567890 .git/index &&
1674 git --no-optional-locks status &&
1675 test-chmtime -v +0 .git/index >out &&
1676 grep ^1234567890 out &&
1677 git status &&
1678 test-chmtime -v +0 .git/index >out &&
1679 ! grep ^1234567890 out
1680'
1681
367c9886 1682test_done