t7508: .gitignore 'expect' and 'output' files
These files are used to observe the behaviour of the 'status' command and if there weren't any such observer, the expected output from 'status' wouldn't even mention them. Place them in .gitignore to unclutter the output expected by the tests. An added benefit is that future tests can add such files that are purely for use by the observer, i.e. the tests themselves, by naming them as expect-foo and/or output-bar. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Mar 6, 2015 at 10:43 UTC
ec8a896eb54f326f65b4103307a50475424d9a03
1 file changed
+13
-65
t/t7508-status.sh
+13
-65
@@ -66,6 +66,12 @@ strip_comments () {
66
rm "$1" && mv "$1".tmp "$1"
67
}
68
69
+cat >.gitignore <<\EOF
70
+.gitignore
71
+expect*
72
+output*
73
+EOF
74
+
75
test_expect_success 'status --column' '
76
cat >expect <<\EOF &&
77
# On branch master
@@ -83,8 +89,8 @@ test_expect_success 'status --column' '
89
# Untracked files:
90
# (use "git add <file>..." to include in what will be committed)
91
#
86
-# dir1/untracked dir2/untracked output
87
-# dir2/modified expect untracked
92
+# dir1/untracked dir2/untracked
93
+# dir2/modified untracked
94
#
95
EOF
96
COLUMNS=50 git -c status.displayCommentPrefix=true status --column="column dense" >output &&
@@ -116,8 +122,6 @@ cat >expect <<\EOF
122
# dir1/untracked
123
# dir2/modified
124
# dir2/untracked
119
-# expect
120
-# output
125
# untracked
126
#
127
EOF
@@ -167,8 +171,6 @@ Untracked files:
171
dir1/untracked
172
dir2/modified
173
dir2/untracked
170
- expect
171
- output
174
untracked
175
176
EOF
@@ -186,8 +188,6 @@ A dir2/added
188
?? dir1/untracked
189
?? dir2/modified
190
?? dir2/untracked
189
-?? expect
190
-?? output
191
?? untracked
192
EOF
193
@@ -320,7 +320,11 @@ EOF
320
test_i18ncmp expect output
321
'
322
323
-rm -f .gitignore
323
+cat >.gitignore <<\EOF
324
+.gitignore
325
+expect*
326
+output*
327
+EOF
328
329
cat >expect <<\EOF
330
## master
@@ -329,8 +333,6 @@ A dir2/added
333
?? dir1/untracked
334
?? dir2/modified
335
?? dir2/untracked
332
-?? expect
333
-?? output
336
?? untracked
337
EOF
338
@@ -434,8 +436,6 @@ Untracked files:
436
dir2/modified
437
dir2/untracked
438
dir3/
437
- expect
438
- output
439
untracked
440
441
EOF
@@ -456,8 +456,6 @@ A dir2/added
456
?? dir2/modified
457
?? dir2/untracked
458
?? dir3/
459
-?? expect
460
-?? output
459
?? untracked
460
EOF
461
test_expect_success 'status -s -unormal' '
@@ -493,8 +491,6 @@ Untracked files:
491
dir2/untracked
492
dir3/untracked1
493
dir3/untracked2
496
- expect
497
- output
494
untracked
495
496
EOF
@@ -518,8 +514,6 @@ A dir2/added
514
?? dir1/untracked
515
?? dir2/modified
516
?? dir2/untracked
521
-?? expect
522
-?? output
517
?? untracked
518
EOF
519
test_expect_success 'status -s -uall' '
@@ -554,8 +548,6 @@ Untracked files:
548
untracked
549
../dir2/modified
550
../dir2/untracked
557
- ../expect
558
- ../output
551
../untracked
552
553
EOF
@@ -569,8 +561,6 @@ A ../dir2/added
561
?? untracked
562
?? ../dir2/modified
563
?? ../dir2/untracked
572
-?? ../expect
573
-?? ../output
564
?? ../untracked
565
EOF
566
test_expect_success 'status -s with relative paths' '
@@ -586,8 +576,6 @@ A dir2/added
576
?? dir1/untracked
577
?? dir2/modified
578
?? dir2/untracked
589
-?? expect
590
-?? output
579
?? untracked
580
EOF
581
@@ -625,8 +613,6 @@ Untracked files:
613
<BLUE>dir1/untracked<RESET>
614
<BLUE>dir2/modified<RESET>
615
<BLUE>dir2/untracked<RESET>
628
- <BLUE>expect<RESET>
629
- <BLUE>output<RESET>
616
<BLUE>untracked<RESET>
617
618
EOF
@@ -647,8 +633,6 @@ cat >expect <<\EOF
633
<BLUE>??<RESET> dir1/untracked
634
<BLUE>??<RESET> dir2/modified
635
<BLUE>??<RESET> dir2/untracked
650
-<BLUE>??<RESET> expect
651
-<BLUE>??<RESET> output
636
<BLUE>??<RESET> untracked
637
EOF
638
@@ -676,8 +660,6 @@ cat >expect <<\EOF
660
<BLUE>??<RESET> dir1/untracked
661
<BLUE>??<RESET> dir2/modified
662
<BLUE>??<RESET> dir2/untracked
679
-<BLUE>??<RESET> expect
680
-<BLUE>??<RESET> output
663
<BLUE>??<RESET> untracked
664
EOF
665
@@ -694,8 +676,6 @@ A dir2/added
676
?? dir1/untracked
677
?? dir2/modified
678
?? dir2/untracked
697
-?? expect
698
-?? output
679
?? untracked
680
EOF
681
@@ -755,8 +735,6 @@ Untracked files:
735
dir1/untracked
736
dir2/modified
737
dir2/untracked
758
- expect
759
- output
738
untracked
739
740
EOF
@@ -772,8 +750,6 @@ A dir2/added
750
?? dir1/untracked
751
?? dir2/modified
752
?? dir2/untracked
775
-?? expect
776
-?? output
753
?? untracked
754
EOF
755
@@ -798,8 +774,6 @@ Untracked files:
774
775
dir1/untracked
776
dir2/
801
- expect
802
- output
777
untracked
778
779
EOF
@@ -848,8 +822,6 @@ Untracked files:
822
dir1/untracked
823
dir2/modified
824
dir2/untracked
851
- expect
852
- output
825
untracked
826
827
EOF
@@ -870,8 +842,6 @@ A sm
842
?? dir1/untracked
843
?? dir2/modified
844
?? dir2/untracked
873
-?? expect
874
-?? output
845
?? untracked
846
EOF
847
test_expect_success 'status -s submodule summary is disabled by default' '
@@ -913,8 +883,6 @@ Untracked files:
883
dir1/untracked
884
dir2/modified
885
dir2/untracked
916
- expect
917
- output
886
untracked
887
888
EOF
@@ -940,8 +908,6 @@ A sm
908
?? dir1/untracked
909
?? dir2/modified
910
?? dir2/untracked
943
-?? expect
944
-?? output
911
?? untracked
912
EOF
913
test_expect_success 'status -s submodule summary' '
@@ -964,8 +930,6 @@ Untracked files:
930
dir1/untracked
931
dir2/modified
932
dir2/untracked
967
- expect
968
- output
933
untracked
934
935
no changes added to commit (use "git add" and/or "git commit -a")
@@ -983,8 +947,6 @@ cat >expect <<EOF
947
?? dir1/untracked
948
?? dir2/modified
949
?? dir2/untracked
986
-?? expect
987
-?? output
950
?? untracked
951
EOF
952
test_expect_success 'status -s submodule summary (clean submodule)' '
@@ -1025,8 +987,6 @@ Untracked files:
987
dir1/untracked
988
dir2/modified
989
dir2/untracked
1028
- expect
1029
- output
990
untracked
991
992
EOF
@@ -1080,8 +1040,6 @@ Untracked files:
1040
dir1/untracked
1041
dir2/modified
1042
dir2/untracked
1083
- expect
1084
- output
1043
untracked
1044
1045
EOF
@@ -1192,8 +1150,6 @@ Untracked files:
1150
dir1/untracked
1151
dir2/modified
1152
dir2/untracked
1195
- expect
1196
- output
1153
untracked
1154
1155
EOF
@@ -1254,8 +1210,6 @@ Untracked files:
1210
dir1/untracked
1211
dir2/modified
1212
dir2/untracked
1257
- expect
1258
- output
1213
untracked
1214
1215
EOF
@@ -1336,8 +1290,6 @@ cat > expect << EOF
1290
; dir1/untracked
1291
; dir2/modified
1292
; dir2/untracked
1339
-; expect
1340
-; output
1293
; untracked
1294
;
1295
EOF
@@ -1369,8 +1321,6 @@ Untracked files:
1321
dir1/untracked
1322
dir2/modified
1323
dir2/untracked
1372
- expect
1373
- output
1324
untracked
1325
1326
no changes added to commit (use "git add" and/or "git commit -a")
@@ -1400,8 +1350,6 @@ Untracked files:
1350
dir1/untracked
1351
dir2/modified
1352
dir2/untracked
1403
- expect
1404
- output
1353
untracked
1354
1355
EOF