Merge branch 'ew/rebase-mboxrd'

diff --git a/t/t7301-clean-interactive.sh b/t/t7301-clean-interactive.sh
index 556e1850e2b20c3f484ee43a975e5dcca8eac99e..1bf9789c8a3cfbb1cc8a6ea33e4a0b1a0da0a7cd 100755 (executable)
--- a/t/t7301-clean-interactive.sh
+++ b/t/t7301-clean-interactive.sh
@@ -3,6 +3,7 @@
 test_description='git clean -i basic tests'
 
 . ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-terminal.sh
 
 test_expect_success 'setup' '
 
@@ -472,10 +473,10 @@ test_expect_success 'git clean -id with prefix and path (ask)' '
 
 '
 
-test_expect_success 'git clean -i paints the header in HEADER color' '
+test_expect_success TTY 'git clean -i paints the header in HEADER color' '
        >a.out &&
        echo q |
-       git -c color.ui=always clean -i |
+       test_terminal git clean -i |
        test_decode_color |
        head -n 1 >header &&
        # not i18ngrep