Revert "t6006: drop "always" color config tests"
This reverts commit c5bdfe677cfab5b2e87771c35565d44d3198efda. That commit was done primarily to prepare for the weakening of "always" in 6be4595edb (color: make "always" the same as "auto" in config, 2017-10-03). But since we've now reverted 6be4595edb, there's no need for us to remove "-c color.ui=always" from the tests. And in fact it's a good idea to restore these tests, to make sure that "always" continues to work. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King committed
Oct 13, 2017 at 13:23 UTC
1d4b12fe7c44da166070a4b577c62fb83127f10e
1 file changed
+15
-5
t/t6006-rev-list-format.sh
+15
-5
@@ -208,11 +208,26 @@ do
208
has_no_color actual
209
'
210
211
+ test_expect_success "$desc enables colors for color.diff" '
212
+ git -c color.diff=always log --format=$color -1 >actual &&
213
+ has_color actual
214
+ '
215
+
216
+ test_expect_success "$desc enables colors for color.ui" '
217
+ git -c color.ui=always log --format=$color -1 >actual &&
218
+ has_color actual
219
+ '
220
+
221
test_expect_success "$desc respects --color" '
222
git log --format=$color -1 --color >actual &&
223
has_color actual
224
'
225
226
+ test_expect_success "$desc respects --no-color" '
227
+ git -c color.ui=always log --format=$color -1 --no-color >actual &&
228
+ has_no_color actual
229
+ '
230
+
231
test_expect_success TTY "$desc respects --color=auto (stdout is tty)" '
232
test_terminal git log --format=$color -1 --color=auto >actual &&
233
has_color actual
@@ -225,11 +240,6 @@ do
240
has_no_color actual
241
)
242
'
228
-
229
- test_expect_success TTY "$desc respects --no-color" '
230
- test_terminal git log --format=$color -1 --no-color >actual &&
231
- has_no_color actual
232
- '
243
done
244
245
test_expect_success '%C(always,...) enables color even without tty' '